projects
/
bertos.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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 be0ed430e0f4d72a3af852436c5f337630eae680..393d0e614ed75bea34589cf4faad97fe1aaf86e2 100755
(executable)
--- a/
test/run_tests.sh
+++ b/
test/run_tests.sh
@@
-33,7
+33,6
@@
SRC_LIST="
bertos/algo/ramp.c
bertos/drv/kdebug.c
bertos/drv/timer.c
bertos/algo/ramp.c
bertos/drv/kdebug.c
bertos/drv/timer.c
- bertos/kern/kfile.c
bertos/kern/monitor.c
bertos/kern/proc.c
bertos/kern/signal.c
bertos/kern/monitor.c
bertos/kern/proc.c
bertos/kern/signal.c
@@
-64,7
+63,8
@@
SRC_LIST="
bertos/cfg/kfile_debug.c
bertos/io/kblock.c
bertos/io/kblock_ram.c
bertos/cfg/kfile_debug.c
bertos/io/kblock.c
bertos/io/kblock_ram.c
- bertos/io/kblock_file.c
+ bertos/io/kblock_posix.c
+ bertos/io/kfile.c
"
buildout='/dev/null'
"
buildout='/dev/null'
@@
-73,7
+73,7
@@
runout='/dev/null'
[ "$VERBOSE" -ge 3 ] && runout='/dev/stdout'
# Needed to get build/exec result code rather than tee's
[ "$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
rm -rf "${TESTOUT}.old"
if [ -d "${TESTOUT}" ] ; then
@@
-94,19
+94,25
@@
for src in $TESTS; do
[ $VERBOSE -gt 0 ] && echo "Preparing $name..."
[ $VERBOSE -gt 4 ] && echo " $PREPARECMD"
[ $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"
[ $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..."
[ $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"
echo "FAILED [RUN]: $name"
+ cat $testdir/$name.out
+ exit 2
fi
else
echo "FAILED [BUILD]: $name"
fi
else
echo "FAILED [BUILD]: $name"
+ cat $testdir/$name.build
+ exit 3
fi
else
echo "FAILED [PREPARING]: $name"
fi
else
echo "FAILED [PREPARING]: $name"
+ cat $testdir/$name.prep
+ exit 4
fi
done
fi
done