summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--build_and_test.sh31
1 files changed, 15 insertions, 16 deletions
diff --git a/build_and_test.sh b/build_and_test.sh
index e086f65..fb2ad89 100644
--- a/build_and_test.sh
+++ b/build_and_test.sh
@@ -24,8 +24,6 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
fi
;;
*msys*|*cygwin*|*mingw*|*nt*|*win*)
- cl.exe --version
- gcc --version
if command -v cl.exe >/dev/null 2>&1; then
echo "C compiler found - MSVC"
COMPILE=cl.exe
@@ -77,22 +75,23 @@ else
fi
fi
-$COMPILE ${FLAG_OBJ} "build/kit${OBJ_POSTFIX}" \
- ${FLAGS} \
+echo "$COMPILE ${FLAGS} ${FLAG_OBJ}"
+$COMPILE ${FLAGS} ${FLAG_OBJ} \
+ "build/kit${OBJ_POSTFIX}" \
"source/kit/_static.c"
if [ ! $? -eq 0 ]; then
exit 1
fi
-$COMPILE ${FLAG_OBJ} "build/kit_test${OBJ_POSTFIX}" \
- ${FLAGS} \
+$COMPILE ${FLAGS} ${FLAG_OBJ} \
+ "build/kit_test${OBJ_POSTFIX}" \
"source/kit_test/_static.c"
if [ ! $? -eq 0 ]; then
exit 1
fi
-$COMPILE ${FLAG_EXE} "build/kit_test_suite${EXE_POSTFIX}" \
- ${FLAGS} \
+$COMPILE ${FLAGS} ${FLAG_EXE} \
+ "build/kit_test_suite${EXE_POSTFIX}" \
"build/kit${OBJ_POSTFIX}" \
"build/kit_test${OBJ_POSTFIX}" \
"source/tests/_static.c"
@@ -100,8 +99,8 @@ if [ ! $? -eq 0 ]; then
exit 1
fi
-$COMPILE ${FLAG_EXE} "build/test_too_many_assertions${EXE_POSTFIX}" \
- ${FLAGS} \
+$COMPILE ${FLAGS} ${FLAG_EXE} \
+ "build/test_too_many_assertions${EXE_POSTFIX}" \
"build/kit${OBJ_POSTFIX}" \
"build/kit_test${OBJ_POSTFIX}" \
"source/tests/test_too_many_assertions.c"
@@ -109,8 +108,8 @@ if [ ! $? -eq 0 ]; then
exit 1
fi
-$COMPILE ${FLAG_EXE} "build/test_too_many_tests${EXE_POSTFIX}" \
- ${FLAGS} \
+$COMPILE ${FLAGS} ${FLAG_EXE} \
+ "build/test_too_many_tests${EXE_POSTFIX}" \
"build/kit${OBJ_POSTFIX}" \
"build/kit_test${OBJ_POSTFIX}" \
"source/tests/test_too_many_tests.c"
@@ -118,8 +117,8 @@ if [ ! $? -eq 0 ]; then
exit 1
fi
-$COMPILEPP ${FLAG_EXE} "build/test_cpp${EXE_POSTFIX}" \
- ${FLAGS} \
+$COMPILEPP ${FLAGS} ${FLAG_EXE} \
+ "build/test_cpp${EXE_POSTFIX}" \
"build/kit${OBJ_POSTFIX}" \
"build/kit_test${OBJ_POSTFIX}" \
"source/tests/test_cpp.cpp"
@@ -127,8 +126,8 @@ if [ ! $? -eq 0 ]; then
exit 1
fi
-$COMPILEPP ${FLAG_EXE} "build/test_signals${EXE_POSTFIX}" \
- ${FLAGS} \
+$COMPILEPP ${FLAGS} ${FLAG_EXE} \
+ "build/test_signals${EXE_POSTFIX}" \
"build/kit${OBJ_POSTFIX}" \
"build/kit_test${OBJ_POSTFIX}" \
"source/tests/test_signals.cpp"