1 files changed, 21 insertions, 21 deletions
diff --git a/build_and_test.sh b/build_and_test.sh
index bcb10c6..f677961 100644
--- a/build_and_test.sh
+++ b/build_and_test.sh
@@ -144,7 +144,7 @@ echo ""
 
 echo "Build kit"
 $COMPILE ${FLAGS} \
-  ${FLAG_OBJ}"build/kit${OBJ_POSTFIX}" \
+  ${FLAG_OBJ}"${FOLDER}/kit${OBJ_POSTFIX}" \
   "source/kit/_lib.c"
 if [ $? -ne 0 ]; then
   exit 1
@@ -152,8 +152,8 @@ fi
 
 echo "Build kit_test_suite"
 $COMPILE ${FLAGS} \
-  ${FLAG_EXE}"build/kit_test_suite${EXE_POSTFIX}" \
-  "build/kit${OBJ_POSTFIX}" \
+  ${FLAG_EXE}"${FOLDER}/kit_test_suite${EXE_POSTFIX}" \
+  "${FOLDER}/kit${OBJ_POSTFIX}" \
   "source/tests/_exe.c" \
   ${LINK_FLAGS}
 if [ $? -ne 0 ]; then
@@ -161,8 +161,8 @@ if [ $? -ne 0 ]; then
 fi
 
 $COMPILE ${FLAGS} \
-  ${FLAG_EXE}"build/test_too_many_assertions${EXE_POSTFIX}" \
-  "build/kit${OBJ_POSTFIX}" \
+  ${FLAG_EXE}"${FOLDER}/test_too_many_assertions${EXE_POSTFIX}" \
+  "${FOLDER}/kit${OBJ_POSTFIX}" \
   "source/tests/test_too_many_assertions.c" \
   ${LINK_FLAGS}
 if [ $? -ne 0 ]; then
@@ -170,8 +170,8 @@ if [ $? -ne 0 ]; then
 fi
 
 $COMPILE ${FLAGS} \
-  ${FLAG_EXE}"build/test_too_many_tests${EXE_POSTFIX}" \
-  "build/kit${OBJ_POSTFIX}" \
+  ${FLAG_EXE}"${FOLDER}/test_too_many_tests${EXE_POSTFIX}" \
+  "${FOLDER}/kit${OBJ_POSTFIX}" \
   "source/tests/test_too_many_tests.c" \
   ${LINK_FLAGS}
 if [ $? -ne 0 ]; then
@@ -179,8 +179,8 @@ if [ $? -ne 0 ]; then
 fi
 
 $COMPILEPP ${FLAGS} \
-  ${FLAG_EXE}"build/test_cpp${EXE_POSTFIX}" \
-  "build/kit${OBJ_POSTFIX}" \
+  ${FLAG_EXE}"${FOLDER}/test_cpp${EXE_POSTFIX}" \
+  "${FOLDER}/kit${OBJ_POSTFIX}" \
   "source/tests/test_cpp.cpp" \
   ${LINK_FLAGS}
 if [ $? -ne 0 ]; then
@@ -188,8 +188,8 @@ if [ $? -ne 0 ]; then
 fi
 
 $COMPILEPP ${FLAGS} \
-  ${FLAG_EXE}"build/test_signals${EXE_POSTFIX}" \
-  "build/kit${OBJ_POSTFIX}" \
+  ${FLAG_EXE}"${FOLDER}/test_signals${EXE_POSTFIX}" \
+  "${FOLDER}/kit${OBJ_POSTFIX}" \
   "source/tests/test_signals.cpp" \
   ${LINK_FLAGS}
 if [ $? -ne 0 ]; then
@@ -197,8 +197,8 @@ if [ $? -ne 0 ]; then
 fi
 
 $COMPILE ${FLAGS} \
-  ${FLAG_EXE}"build/test_interprocess${EXE_POSTFIX}" \
-  "build/kit${OBJ_POSTFIX}" \
+  ${FLAG_EXE}"${FOLDER}/test_interprocess${EXE_POSTFIX}" \
+  "${FOLDER}/kit${OBJ_POSTFIX}" \
   "source/tests/test_interprocess.c" \
   ${LINK_FLAGS}
 if [ $? -ne 0 ]; then
@@ -210,12 +210,12 @@ echo ""
 
 STATUS=0
 
-./build/kit_test_suite
+${FOLDER}/kit_test_suite
 if [ $? -ne 0 ]; then
   STATUS=1
 fi
 
-./build/test_too_many_assertions --quiet
+${FOLDER}/test_too_many_assertions --quiet
 if [ $? -eq 0 ]; then
   echo "too many assertions - OK"
 else
@@ -223,7 +223,7 @@ else
   STATUS=1
 fi
 
-./build/test_too_many_tests --quiet
+${FOLDER}/test_too_many_tests --quiet
 if [ $? -eq 0 ]; then
   echo "too many tests      - OK"
 else
@@ -231,7 +231,7 @@ else
   STATUS=1
 fi
 
-./build/test_cpp --quiet
+${FOLDER}/test_cpp --quiet
 if [ $? -eq 0 ]; then
   echo "cpp                 - OK"
 else
@@ -239,7 +239,7 @@ else
   STATUS=1
 fi
 
-./build/test_signals --quiet
+${FOLDER}/test_signals --quiet
 if [ $? -eq 0 ]; then
   echo "signals             - OK"
 else
@@ -247,9 +247,9 @@ else
   STATUS=1
 fi
 
-./build/test_interprocess clean
-./build/test_interprocess reader &
-./build/test_interprocess writer
+${FOLDER}/test_interprocess clean
+${FOLDER}/test_interprocess reader &
+${FOLDER}/test_interprocess writer
 if [ $? -eq 0 ]; then
   echo "interprocess        - OK"
 else