X-Git-Url: https://codewiz.org/gitweb?p=bertos.git;a=blobdiff_plain;f=test%2Frun_tests.sh;h=348cbb989d1d333b905cc456916e29ae0343ab41;hp=16171d64de2149f5d4b4050ed79c2ad7eaa0fb76;hb=HEAD;hpb=2ab79cb0c9069ed5084627954b6e2c3493a5c4af

diff --git a/test/run_tests.sh b/test/run_tests.sh
index 16171d64..348cbb98 100755
--- a/test/run_tests.sh
+++ b/test/run_tests.sh
@@ -17,19 +17,69 @@ VERBOSE=${VERBOSE:-1}
 
 CC=gcc
 #FIXME: -Ibertos/emul should not be needed
-CFLAGS="-W -Wall -Wextra -O0 -g3 -ggdb -Ibertos -Ibertos/emul -std=gnu99 -fno-builtin -D_DEBUG -DARCH=(ARCH_EMUL|ARCH_UNITTEST)"
+CFLAGS="-W -Wall -Wextra -Wundef -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -Wsign-compare -Wmissing-noreturn \
+-O0 -g3 -ggdb -Ibertos -Ibertos/emul -Ibertos/net/lwip/src/include -Ibertos/net/lwip/src/include/ipv4 -std=gnu99 -fno-builtin -D_DEBUG -DARCH=(ARCH_EMUL|ARCH_UNITTEST) \
+-DCPU_FREQ=(12288000UL) -ffunction-sections -fdata-sections -Wl,--gc-sections"
 
 CXX=g++
 CXXFLAGS="$CFLAGS"
 
 TESTS=${TESTS:-`find . \
 	\( -name .svn -prune -o -name .git -prune -o -name .hg  -prune \) \
-	-o -name "*_test.c*" -print` }
+	-o -name "*_test.c" -print` }
 
 TESTOUT="testout"
-
-#Unit test static library
-TESTLIB="images/libunittest.a"
+SRC_LIST="
+	bertos/algo/ramp.c
+	bertos/algo/crc_ccitt.c
+	bertos/algo/crc.c
+	bertos/algo/fletcher32.c
+	bertos/drv/kdebug.c
+	bertos/drv/timer.c
+	bertos/kern/monitor.c
+	bertos/kern/proc.c
+	bertos/kern/signal.c
+	bertos/kern/sem.c
+	bertos/kern/preempt.c
+	bertos/kern/rtask.c
+	bertos/mware/event.c
+	bertos/mware/formatwr.c
+	bertos/mware/hex.c
+	bertos/mware/sprintf.c
+	bertos/os/hptime.c
+	bertos/struct/kfile_fifo.c
+	bertos/struct/heap.c
+	bertos/struct/hashtable.c
+	bertos/struct/bitarray.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
+	bertos/struct/kfile_mem.c
+	bertos/net/ax25.c
+	bertos/net/afsk.c
+	bertos/net/nmeap/src/nmeap01.c
+	bertos/net/nmea.c
+	bertos/net/http.c
+	bertos/cfg/kfile_debug.c
+	bertos/io/kblock.c
+	bertos/io/kblock_ram.c
+	bertos/io/kblock_posix.c
+	bertos/io/kfile.c
+	bertos/sec/cipher.c
+	bertos/sec/cipher/blowfish.c
+	bertos/sec/cipher/aes.c
+	bertos/sec/kdf/pbkdf1.c
+	bertos/sec/kdf/pbkdf2.c
+	bertos/sec/hash/sha1.c
+	bertos/sec/hash/md5.c
+	bertos/sec/hash/ripemd.c
+	bertos/sec/mac/hmac.c
+	bertos/sec/mac/omac.c
+"
 
 buildout='/dev/null'
 runout='/dev/null'
@@ -40,27 +90,43 @@ runout='/dev/null'
 set -o pipefail
 
 rm -rf "${TESTOUT}.old"
-mv -f "${TESTOUT}" "$TESTOUT.old"
+if [ -d "${TESTOUT}" ] ; then
+	mv -f "${TESTOUT}" "$TESTOUT.old"
+fi
 mkdir -p "$TESTOUT"
 
 for src in $TESTS; do
 	name="`basename $src | sed -e 's/\.cpp$//' -e 's/\.c$//'`"
-	exe="./$TESTOUT/$name"
+	testdir="./$TESTOUT/$name"
+	cfgdir="$testdir/cfg"
+	mkdir -p "$cfgdir"
+	exe="$testdir/$name"
 
-	case "$src" in
-	*.cpp) BUILDCMD="$CXX $CXXFLAGS $src $TESTLIB -o $exe" ;;
-	*.c)   BUILDCMD="$CC  $CFLAGS $src $TESTLIB -o $exe" ;;
-	esac
+	PREPARECMD="test/parsetest.py $src"
+	BUILDCMD="$CC -I$testdir $CFLAGS $src $SRC_LIST -o $exe"
+	export testdir name cfgdir
 
-	[ $VERBOSE -gt 0 ] && echo "Building $name..."
-	[ $VERBOSE -gt 4 ] && echo " $BUILDCMD"
-	if $BUILDCMD 2>&1 | tee >$buildout $TESTOUT/$name.build; then
-		[ $VERBOSE -gt 0 ] && echo "Running $name..."
-		if ! $exe 2>&1 | tee >$runout $TESTOUT/$name.out; then
-			echo "FAILED [RUN]: $name"
+	[ $VERBOSE -gt 0 ] && echo "Preparing $name..."
+	[ $VERBOSE -gt 4 ] && echo " $PREPARECMD"
+	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 -a >>$buildout $testdir/$name.build; then
+			[ $VERBOSE -gt 0 ] && echo "Running $name..."
+			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 [BUILD]: $name"
+		echo "FAILED [PREPARING]: $name"
+		cat $testdir/$name.prep
+		exit 4
 	fi
 done