commit 2ba6b0d34c964b6bb3fa85353d47fd73b884c0ef
parent dc6f88cdaca33c52d0e7e443fcf0dbda922708b7
Author: kyle <kyle@0x30.net>
Date: Mon, 21 Nov 2016 01:28:47 -0700
t: reduce usage of jam in testsuite
Diffstat:
2 files changed, 7 insertions(+), 14 deletions(-)
diff --git a/t/inst_link_multiple.sh b/t/inst_link_multiple.sh
@@ -33,19 +33,15 @@ void third_func(void) {
}
EOF
-cat <<EOF > Jamfile
-Main program : one.c two.c three.c ;
-EOF
-
-ok "compiling source w/ jam" citrun-wrap jam
+ok "is compile ok" citrun-wrap cc -o main one.c two.c three.c
ok "running citrun-check" citrun-check -o check.out
cat <<EOF > check.good
Summary:
3 Source files used as input
1 Application link commands
- 3 Rewrite successes
- 3 Rewritten source compile successes
+ 1 Rewrite successes
+ 1 Rewritten source compile successes
Totals:
18 Lines of source code
diff --git a/t/inst_log.sh b/t/inst_log.sh
@@ -5,12 +5,12 @@
#
. t/libtap.subr
. t/utils.subr
-plan 2
+plan 3
modify_PATH
enter_tmpdir
-cat <<EOF > source_0.c
+cat <<EOF > main.c
#include <stdlib.h>
long long
@@ -34,11 +34,8 @@ main(int argc, char *argv[])
}
EOF
-cat <<EOF > Jamfile
-Main program : source_0.c ;
-EOF
-
-ok "source compiled with jam" citrun-wrap jam
+ok "is compile ok" citrun-wrap cc -c main.c
+ok "is link ok" citrun-wrap cc -o main main.o
strip_log citrun.log