summaryrefslogtreecommitdiff
path: root/client/test.sh
diff options
context:
space:
mode:
Diffstat (limited to 'client/test.sh')
-rwxr-xr-xclient/test.sh12
1 files changed, 6 insertions, 6 deletions
diff --git a/client/test.sh b/client/test.sh
index b2ad68d..05f6372 100755
--- a/client/test.sh
+++ b/client/test.sh
@@ -6,13 +6,13 @@ MAKEFILE=Makefile.test
TEST_APP=test_app
# Make sure that pracro.cc gets compiled again with the TESTING flags set.
-touch pracro.cc
+rm -f pracro.o
if [ -z $1 ]
then
- TESTFILES=test/test*.cc
+ TESTFILES=test/test*.cc
else
- TESTFILES=$1
+ TESTFILES=$1
fi
rm -f test.log
@@ -29,14 +29,14 @@ do
echo ${COMPILE} >> $OUTPUT
cpp -P -E -DTESTFILE=\"$TEST\" $TEST_PRO_IN -o $TEST_PRO
qmake -makefile $TEST_PRO -o $MAKEFILE
- if make -f $MAKEFILE 2>&1 >> ${OUTPUT}; then
+ if make -f $MAKEFILE >> ${OUTPUT} 2>&1 ; then
echo -e "\r\t\t\t\t\t\t[\033[1;32mSuccess\033[0;2m]"
echo "[Success]" >> $OUTPUT
echo -n "* Running $TEST test"
echo Running $TEST test: >> $OUTPUT
cp -f $TEST_APP $TEST.bin
- if ./$TEST_APP 2>&1 >> $OUTPUT ; then
+ if ./$TEST_APP >> $OUTPUT 2>&1 ; then
echo -e "\r\t\t\t\t\t\t[\033[1;32mSuccess\033[0;2m]"
echo "[Success]" >> $OUTPUT
else
@@ -53,4 +53,4 @@ done
# Make sure that a 'normal' compile will compile pracro.cc
# without the TESTING flag set
-touch pracro.cc
+rm -f pracro.o