Restore separate logs; cat errors to stdout.

[bertos.git] / test / run_tests.sh

diff --git a/test/run_tests.sh b/test/run_tests.sh
index 367b98bb971115c00f3c280447f22c7ff7d8316a..393d0e614ed75bea34589cf4faad97fe1aaf86e2 100755 (executable)
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -33,14 +33,11 @@ SRC_LIST="
        bertos/algo/ramp.c
        bertos/drv/kdebug.c
        bertos/drv/timer.c
-       bertos/fs/battfs.c
-       bertos/kern/idle.c
-       bertos/kern/kfile.c
        bertos/kern/monitor.c
        bertos/kern/proc.c
        bertos/kern/signal.c
        bertos/kern/sem.c
-       bertos/kern/mtask.c
+       bertos/kern/preempt.c
        bertos/mware/event.c
        bertos/mware/formatwr.c
        bertos/mware/hex.c
@@ -48,9 +45,11 @@ SRC_LIST="
        bertos/os/hptime.c
        bertos/struct/kfile_fifo.c
        bertos/struct/heap.c
+       bertos/struct/hashtable.c
        bertos/fs/fatfs/ff.c
        bertos/emul/diskio_emul.c
        bertos/fs/fat.c
+       bertos/fs/battfs.c
        bertos/emul/switch_ctx_emul.S
        bertos/mware/ini_reader.c
        bertos/emul/kfile_posix.c
@@ -61,6 +60,11 @@ SRC_LIST="
        bertos/net/afsk.c
        bertos/net/nmeap/src/nmeap01.c
        bertos/net/nmea.c
+       bertos/cfg/kfile_debug.c
+       bertos/io/kblock.c
+       bertos/io/kblock_ram.c
+       bertos/io/kblock_posix.c
+       bertos/io/kfile.c
 "
 
 buildout='/dev/null'
@@ -69,7 +73,7 @@ runout='/dev/null'
 [ "$VERBOSE" -ge 3 ] && runout='/dev/stdout'
 
 # Needed to get build/exec result code rather than tee's
-set -o pipefail
+#set -o pipefail
 
 rm -rf "${TESTOUT}.old"
 if [ -d "${TESTOUT}" ] ; then
@@ -90,19 +94,25 @@ for src in $TESTS; do
 
        [ $VERBOSE -gt 0 ] && echo "Preparing $name..."
        [ $VERBOSE -gt 4 ] && echo " $PREPARECMD"
-       if $PREPARECMD 2>&1 | tee >$buildout $testdir/$name.prep; then
+       if $PREPARECMD 2>&1 | tee -a >>$buildout $testdir/$name.prep; then
                [ $VERBOSE -gt 0 ] && echo "Building $name..."
                [ $VERBOSE -gt 4 ] && echo " $BUILDCMD"
-               if $BUILDCMD 2>&1 | tee >$buildout $testdir/$name.build; then
+               if $BUILDCMD 2>&1 | tee -a >>$buildout $testdir/$name.build; then
                        [ $VERBOSE -gt 0 ] && echo "Running $name..."
-                       if ! $exe 2>&1 | tee >$runout $testdir/$name.out; then
+                       if ! $exe 2>&1 | tee -a >>$runout $testdir/$name.out; then
                                echo "FAILED [RUN]: $name"
+                               cat $testdir/$name.out
+                               exit 2
                        fi
                else
                        echo "FAILED [BUILD]: $name"
+                       cat $testdir/$name.build
+                       exit 3
                fi
        else
                echo "FAILED [PREPARING]: $name"
+               cat $testdir/$name.prep
+               exit 4
        fi
 done