Commit d2370c72a62f9a52df325a6b5ceea584e9e0b4f0
2023-08-21T12:41:30
make test_gcovr
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111
diff --git a/Makefile b/Makefile
index 4eec995..3a8a674 100644
--- a/Makefile
+++ b/Makefile
@@ -104,9 +104,6 @@ ic3_gcovr:
${MAKE} ic3_test_cov
${MAKE} gcovr
-ic3_test_cov: cov
- ${MAKE} -C test ic3_test_cov
-
install:
${GMAKE} -C libffi install
${MAKE} -C libc3 install
@@ -118,9 +115,6 @@ libc3_gcovr:
${MAKE} libc3_test_cov
${MAKE} gcovr
-libc3_test_cov: cov
- ${MAKE} -C test libc3_test_cov
-
libffi:
${GMAKE} -C libffi all
@@ -150,19 +144,28 @@ test_debug: debug
test_gcovr:
${MAKE} clean_cov
- ${MAKE} libc3_test_cov
- ${MAKE} ic3_test_cov
+ ${MAKE} test_libc3_cov
+ ${MAKE} test_ic3_cov
${MAKE} gcovr
test_ic3: build
${MAKE} -C test test_ic3
+test_ic3_cov: cov
+ ${MAKE} -C test test_ic3_cov
+
test_ic3_debug: debug
${MAKE} -C test test_ic3_debug
test_libc3: build
${MAKE} -C test test_libc3
+test_libc3_cov: cov
+ ${MAKE} -C test test_libc3_cov
+
+test_libc3_debug: debug
+ ${MAKE} -C test test_libc3_debug
+
.PHONY: all asan c3s cov clean clean_cov debug gcovr ic3 install libc3 libtommath libffi license test test_asan test_cov test_debug test_gcovr test_ic3
include config.mk
diff --git a/config.subr b/config.subr
index 454e94c..6134807 100644
--- a/config.subr
+++ b/config.subr
@@ -99,7 +99,7 @@ config_lib() {
echo "/* generated by configure */" > "$OUT"
echo "int main () { return 0; }" >> "$OUT"
LIBS="${LIBS} $@"
- if ${CC} ${CPPFLAGS} ${CFLAGS} "$OUT" ${LIBS} -o /dev/null 2>/dev/null; then
+ if ${CC} ${CPPFLAGS} ${CFLAGS} "$OUT" ${LIBS} -o /dev/null; then
:
else
LIBS="${LIBS_SAVE}"
diff --git a/test/Makefile b/test/Makefile
index 07be738..2497975 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -66,9 +66,6 @@ gcovr:
gdb_test: debug
if [ -f libc3_test_debug.core ]; then gdb .libs/libc3_test_debug libc3_test_debug.core; else gdb .libs/libc3_test_debug; fi
-ic3_test_cov:
- IC3=${SRC_TOP}/ic3/ic3_cov time ./ic3_test
-
lldb_test: debug
if [ -f libc3_test_debug.core ]; then lldb .libs/libc3_test_debug libc3_test_debug.core; else lldb .libs/libc3_test_debug; fi
@@ -91,6 +88,9 @@ test_debug: libc3_test_debug
test_ic3:
IC3=${SRC_TOP}/ic3/ic3 time ./ic3_test
+test_ic3_cov:
+ IC3=${SRC_TOP}/ic3/ic3_cov time ./ic3_test
+
test_ic3_debug:
IC3=${SRC_TOP}/ic3/ic3_debug time ./ic3_test
diff --git a/test/configure b/test/configure
index 65166eb..5ad3968 100755
--- a/test/configure
+++ b/test/configure
@@ -51,13 +51,13 @@ LIBS="${LIBS:=} -lm"
# Common config for all targets
CFLAGS="$CFLAGS -W -Wall -Werror -std=c99 -pedantic"
CPPFLAGS="$CPPFLAGS -I../libffi/include"
-LIBS="$LIBS ../libffi/libffi.la -pthread"
config_asan
config_gnu
pkg_config libbsd-overlay
pkg_config libmd
config_lib libmd -lmd
config_lib dl -ldl
+LIBS="$LIBS ../libffi/libffi.la -pthread"
# Asan config
CFLAGS_ASAN="$CFLAGS -fsanitize=address -O1 -fno-omit-frame-pointer -g"