[Fuego] [PATCH 09/19] rebuild: make it simpler for test developers
Bird, Timothy
Tim.Bird at sony.com
Fri May 12 23:02:37 UTC 2017
This one worries me a bit.
I like the simplification, but I'm not sure I trust the logic (see below for a question).
> -----Original Message-----
> From: fuego-bounces at lists.linuxfoundation.org [mailto:fuego-
> bounces at lists.linuxfoundation.org] On Behalf Of Daniel Sangorrin
> Sent: Friday, May 12, 2017 1:20 AM
> To: fuego at lists.linuxfoundation.org
> Subject: [Fuego] [PATCH 09/19] rebuild: make it simpler for test developers
>
> This commit reimplements the way the "rebuild" flag is handled.
> First, it unifies the variables 'build_failed' and 'test_suite_ready'
> into a single 'fuego_test_succesfully_built' variable.
> And second, the core code inside functions.sh is in charge of
> setting this variable by reading the exit code from test_build.
>
> Therefore, the main change is that now test developers only need
> to care about the exit code returned by test_build. The variable
> fuego_test_succesfully_built is handled by the core code, so
> no need of redundant code on each test.
>
> TODO: change the documentation for test creators.
>
> Signed-off-by: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
> ---
> engine/scripts/functions.sh | 57 +++++++++++-----------
> engine/tests/Benchmark.Dhrystone/fuego_test.sh | 6 +--
> engine/tests/Benchmark.GLMark/fuego_test.sh | 2 +-
> engine/tests/Benchmark.IOzone/fuego_test.sh | 4 +-
> engine/tests/Benchmark.Interbench/fuego_test.sh | 2 +-
> engine/tests/Benchmark.Java/fuego_test.sh | 4 --
> engine/tests/Benchmark.Stream/fuego_test.sh | 2 +-
> engine/tests/Benchmark.Whetstone/fuego_test.sh | 2 +-
> engine/tests/Benchmark.aim7/fuego_test.sh | 2 +-
> engine/tests/Benchmark.blobsallad/fuego_test.sh | 2 +-
> engine/tests/Benchmark.bonnie/fuego_test.sh | 2 +-
> engine/tests/Benchmark.cyclictest/fuego_test.sh | 2 +-
> engine/tests/Benchmark.dbench/fuego_test.sh | 2 +-
> engine/tests/Benchmark.ebizzy/fuego_test.sh | 2 +-
> engine/tests/Benchmark.ffsb/fuego_test.sh | 2 +-
> engine/tests/Benchmark.fio/fuego_test.sh | 1 -
> .../Benchmark.fuego_check_plots/fuego_test.sh | 4 --
> engine/tests/Benchmark.gtkperf/fuego_test.sh | 2 +-
> engine/tests/Benchmark.hackbench/fuego_test.sh | 2 +-
> engine/tests/Benchmark.himeno/fuego_test.sh | 2 +-
> engine/tests/Benchmark.iperf/fuego_test.sh | 2 +-
> engine/tests/Benchmark.linpack/fuego_test.sh | 2 +-
> engine/tests/Benchmark.lmbench2/fuego_test.sh | 2 +-
> engine/tests/Benchmark.nbench-byte/fuego_test.sh | 2 +-
> engine/tests/Benchmark.nbench_byte/fuego_test.sh | 2 +-
> engine/tests/Benchmark.netpipe/fuego_test.sh | 2 +-
> engine/tests/Benchmark.signaltest/fuego_test.sh | 2 +-
> engine/tests/Benchmark.tiobench/fuego_test.sh | 2 +-
> engine/tests/Benchmark.x11perf/fuego_test.sh | 2 +-
> engine/tests/Functional.LTP/fuego_test.sh | 2 -
> engine/tests/Functional.aiostress/fuego_test.sh | 2 +-
> engine/tests/Functional.bsdiff/fuego_test.sh | 4 --
> engine/tests/Functional.bzip2/fuego_test.sh | 1 -
> engine/tests/Functional.cmt/fuego_test.sh | 4 --
> engine/tests/Functional.crashme/fuego_test.sh | 2 +-
> engine/tests/Functional.curl/fuego_test.sh | 4 --
> engine/tests/Functional.expat/fuego_test.sh | 4 +-
> engine/tests/Functional.fixesproto/fuego_test.sh | 2 -
> engine/tests/Functional.fuego_abort/fuego_test.sh | 4 --
> .../Functional.fuego_board_check/fuego_test.sh | 4 --
> .../Functional.fuego_test_phases/fuego_test.sh | 1 -
> engine/tests/Functional.glib/fuego_test.sh | 2 +-
> engine/tests/Functional.glibc/fuego_test.sh | 1 -
> engine/tests/Functional.hello_world/fuego_test.sh | 2 +-
> engine/tests/Functional.imagemagick/fuego_test.sh | 1 -
> engine/tests/Functional.ipv6connect/fuego_test.sh | 2 +-
> engine/tests/Functional.jpeg/fuego_test.sh | 1 -
> engine/tests/Functional.libtar/fuego_test.sh | 1 -
> engine/tests/Functional.linus_stress/fuego_test.sh | 2 +-
> engine/tests/Functional.lwip/fuego_test.sh | 1 -
> engine/tests/Functional.pi_tests/fuego_test.sh | 2 +-
> engine/tests/Functional.pixman/fuego_test.sh | 1 -
> engine/tests/Functional.pppd/fuego_test.sh | 1 -
> engine/tests/Functional.protobuf/fuego_test.sh | 1 -
> engine/tests/Functional.rmaptest/fuego_test.sh | 2 +-
> engine/tests/Functional.scifab/fuego_test.sh | 4 --
> engine/tests/Functional.scrashme/fuego_test.sh | 10 ++--
> engine/tests/Functional.sdhi_0/fuego_test.sh | 4 --
> engine/tests/Functional.stress/fuego_test.sh | 2 +-
> engine/tests/Functional.synctest/fuego_test.sh | 2 +-
> engine/tests/Functional.thrift/fuego_test.sh | 1 -
> engine/tests/Functional.xorg-macros/fuego_test.sh | 1 -
> engine/tests/Functional.zlib/fuego_test.sh | 2 +-
> engine/tests/OpenSSL/openssl.sh | 1 -
> engine/tests/netperf/netperf.sh | 2 +-
> 65 files changed, 75 insertions(+), 130 deletions(-)
>
> diff --git a/engine/scripts/functions.sh b/engine/scripts/functions.sh
> index d5bf969..7ff77bc 100755
> --- a/engine/scripts/functions.sh
> +++ b/engine/scripts/functions.sh
> @@ -159,12 +159,13 @@ function dump_syslogs {
> ov_rootfs_logread "$@"
> }
>
> +# Wait if an instance of the same job (board-test-spec) is running
> function concurrent_check {
> LOCKFILE="$WORKSPACE/$TRIPLET.build.lock"
>
> if [ -e ${LOCKFILE} ]; then
>
> - while $(wget -qO- "$(cat
> ${LOCKFILE})/api/xml?xpath=*/building/text%28%29") && [ ! -e
> test_suite_ready ]
> + while $(wget -qO- "$(cat
> ${LOCKFILE})/api/xml?xpath=*/building/text%28%29") && [ ! -e
> fuego_test_succesfully_built ]
> do
> sleep 5
> done
> @@ -173,43 +174,41 @@ function concurrent_check {
> echo "${BUILD_URL}" > ${LOCKFILE}
> }
>
> -function build_error () {
> - touch build_failed
> - abort_job "Build failed: $@"
> -}
> -
> -# Wait for other builds of the same test running in parallel,
> # process Rebuild flag, and unpack test sources if necessary.
> -# Returns 0 if actual build needs to be performed; 1 - otherwise.
> -# Build scripts must call this function in the beginning.
> function pre_build {
> - cd ${WORKSPACE}
> + cd ${WORKSPACE}
>
> - mkdir -p $TRIPLET && cd $TRIPLET
> - if concurrent_check; then
> - [ "$Rebuild" = "true" ] && rm -rf *
> + mkdir -p $TRIPLET && cd $TRIPLET
>
> - if [ -e build_failed ]; then
> - rm $TRIPLET/build_failed
> - rm -rf *
> - fi
> + concurrent_check
>
> - if [ ! -e test_suite_ready ]; then
> - unpack || abort_job "Error while unpacking"
> - return 0
> + if [ "$Rebuild" = "false" ] && [ -e fuego_test_succesfully_built ]; then
> + echo "The test is already built"
> + else
> + rm -rf *
> + unpack || abort_job "Error while unpacking"
> fi
> - fi
> - return 1
> }
>
> function build {
> - pre_build
> - build_start_time=$(date +"%s.%N")
> - test_build || return 1
> - build_end_time=$(date +"%s.%N")
> - build_duration=$(python -c "print $build_end_time - $build_start_time")
> - echo "Fuego test_build duration=$build_duration seconds"
> - post_build
> + local ret
> +
> + pre_build
> + if [ -e fuego_test_succesfully_built ]; then
> + build_duration=0
> + else
> + build_start_time=$(date +"%s.%N")
> + call_if_present test_build && ret=0 || ret=$?
> + build_end_time=$(date +"%s.%N")
> + build_duration=$(python -c "print $build_end_time -
> $build_start_time")
> + if [ $ret -eq 0 ]; then
> + touch fuego_test_succesfully_built
> + else
> + abort_job "ERROR: test_build returned $ret"
> + fi
> + fi
> + echo "Fuego test_build duration=$build_duration seconds"
> + post_build
> }
>
> function post_build {
> diff --git a/engine/tests/Benchmark.Dhrystone/fuego_test.sh
> b/engine/tests/Benchmark.Dhrystone/fuego_test.sh
> index bc3f4c8..5f5f2ed 100755
> --- a/engine/tests/Benchmark.Dhrystone/fuego_test.sh
> +++ b/engine/tests/Benchmark.Dhrystone/fuego_test.sh
> @@ -5,14 +5,14 @@ function test_pre_check {
> }
>
> function test_build {
> - patch -p0 -N -s < $TEST_HOME/dhry_1.c.patch || return 1
> + patch -p0 -N -s < $TEST_HOME/dhry_1.c.patch || return
Does this end up returning the return value from patch?
How does this interact with 'set -e'? I think this should work
since bash doesn't trap command errors when the command
is in a logic expression. But does an error trap from the
non-zero return from test_build?
> CFLAGS+=" -DTIME"
> LDFLAGS+=" -lm"
> - make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" && touch
> test_suite_ready || return 1
> + make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
> }
>
> function test_deploy {
> - put dhrystone $BOARD_TESTDIR/fuego.$TESTDIR/ || return 1
> + put dhrystone $BOARD_TESTDIR/fuego.$TESTDIR/
> }
>
> function test_run {
> diff --git a/engine/tests/Benchmark.GLMark/fuego_test.sh
> b/engine/tests/Benchmark.GLMark/fuego_test.sh
> index f409109..7deb6e2 100755
> --- a/engine/tests/Benchmark.GLMark/fuego_test.sh
> +++ b/engine/tests/Benchmark.GLMark/fuego_test.sh
> @@ -7,7 +7,7 @@ function test_build {
> -L${SDKROOT}/usr/lib -Wl,-rpath-link=${SDKROOT}/usr/lib \
> -L${SDKROOT}/lib \
> *.cpp -o glmark -lSDL -lGL \
> - -lGLU -lGLEW && touch test_suite_ready || build_error "error while
> building test"
> + -lGLU -lGLEW
> # -Wl,--allow-shlib-undefined *.cpp -o glmark -lSDL -lGL \
> }
>
> diff --git a/engine/tests/Benchmark.IOzone/fuego_test.sh
> b/engine/tests/Benchmark.IOzone/fuego_test.sh
> index fe06e75..16b5c61 100755
> --- a/engine/tests/Benchmark.IOzone/fuego_test.sh
> +++ b/engine/tests/Benchmark.IOzone/fuego_test.sh
> @@ -11,10 +11,10 @@ function test_build {
> TARGET=linux-AMD64
> else
> echo "platform based on $ARCHITECTURE is not supported by
> benchmark"
> - build_error "error while building test"
> + return 1
> fi
>
> - make $TARGET GCC="$CC" CC="$CC" AR="$AR" RANLIB="$RANLIB"
> CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" && touch test_suite_ready ||
> build_error "error while building test"
> + make $TARGET GCC="$CC" CC="$CC" AR="$AR" RANLIB="$RANLIB"
> CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.Interbench/fuego_test.sh
> b/engine/tests/Benchmark.Interbench/fuego_test.sh
> index 5f950e2..31e6d2f 100755
> --- a/engine/tests/Benchmark.Interbench/fuego_test.sh
> +++ b/engine/tests/Benchmark.Interbench/fuego_test.sh
> @@ -2,7 +2,7 @@ tarball=interbench-0.31.tar.bz2
>
> function test_build {
> patch -p0 < $TEST_HOME/interbench.c.patch
> - make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP"
> CXXCPP="$CXXCPP" && touch test_suite_ready || build_error "error while
> building test"
> + make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP"
> CXXCPP="$CXXCPP"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.Java/fuego_test.sh
> b/engine/tests/Benchmark.Java/fuego_test.sh
> index 7978263..22cdbb7 100755
> --- a/engine/tests/Benchmark.Java/fuego_test.sh
> +++ b/engine/tests/Benchmark.Java/fuego_test.sh
> @@ -1,9 +1,5 @@
> tarball=java_perf.tar
>
> -function test_build {
> - touch test_suite_ready
> -}
> -
> function test_deploy {
> put *.jar $BOARD_TESTDIR/fuego.$TESTDIR/
> }
> diff --git a/engine/tests/Benchmark.Stream/fuego_test.sh
> b/engine/tests/Benchmark.Stream/fuego_test.sh
> index ddeb26c..9f4c04c 100755
> --- a/engine/tests/Benchmark.Stream/fuego_test.sh
> +++ b/engine/tests/Benchmark.Stream/fuego_test.sh
> @@ -1,7 +1,7 @@
> tarball=stream.tar.bz2
>
> function test_build {
> - make stream_c.exe CFLAGS+="${CFLAGS}" CC="$CC" AR="$AR"
> RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" && touch
> test_suite_ready || build_error "error while building test"
> + make stream_c.exe CFLAGS+="${CFLAGS}" CC="$CC" AR="$AR"
> RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.Whetstone/fuego_test.sh
> b/engine/tests/Benchmark.Whetstone/fuego_test.sh
> index 925bfcb..5e791f0 100755
> --- a/engine/tests/Benchmark.Whetstone/fuego_test.sh
> +++ b/engine/tests/Benchmark.Whetstone/fuego_test.sh
> @@ -2,7 +2,7 @@ tarball=Whetstone.tar.bz2
>
> function test_build {
> CFLAGS+=" -DTIME"
> - make CC="$CC" LD="$LD" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
> LIBS=" -lm" && touch test_suite_ready || build_error "error while building
> test"
> + make CC="$CC" LD="$LD" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
> LIBS=" -lm"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.aim7/fuego_test.sh
> b/engine/tests/Benchmark.aim7/fuego_test.sh
> index 2cee552..87f9df9 100755
> --- a/engine/tests/Benchmark.aim7/fuego_test.sh
> +++ b/engine/tests/Benchmark.aim7/fuego_test.sh
> @@ -3,7 +3,7 @@ tarball=osdl-aim-7.0.1.13.tar.gz
> function test_build {
> ./bootstrap
> PKG_CONFIG_PATH=${SDKROOT}/usr/lib/pkgconfig
> PKG_CONFIG_ALLOW_SYSTEM_LIBS=1
> PKG_CONFIG_SYSROOT_DIR=${SDKROOT} ./configure --host=$HOST --
> build=`uname -m`-linux-gnu LDFLAGS=-L${SDKROOT}/usr/lib CPPFLAGS=-
> I${SDKROOT}/usr/include CFLAGS=-I${SDKROOT}/usr/include LIBS=-laio --
> prefix=$BOARD_TESTDIR/$TESTDIR --
> datarootdir=$BOARD_TESTDIR/$TESTDIR
> - make && touch test_suite_ready || build_error "error while building
> test"
> + make
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.blobsallad/fuego_test.sh
> b/engine/tests/Benchmark.blobsallad/fuego_test.sh
> index ed5273d..f849946 100755
> --- a/engine/tests/Benchmark.blobsallad/fuego_test.sh
> +++ b/engine/tests/Benchmark.blobsallad/fuego_test.sh
> @@ -5,7 +5,7 @@ function test_build {
> patch -p0 -N -s < $TEST_HOME/blobsallad.auto.patch
> patch -p0 -N -s < $TEST_HOME/bs_main.c.patch
>
> - make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP"
> CXXCPP="$CXXCPP" SDKROOT="$SDKROOT" && touch test_suite_ready ||
> build_error "error while building test"
> + make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP"
> CXXCPP="$CXXCPP" SDKROOT="$SDKROOT"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.bonnie/fuego_test.sh
> b/engine/tests/Benchmark.bonnie/fuego_test.sh
> index 562088a..d94dce4 100755
> --- a/engine/tests/Benchmark.bonnie/fuego_test.sh
> +++ b/engine/tests/Benchmark.bonnie/fuego_test.sh
> @@ -2,7 +2,7 @@ tarball=bonnie++-1.03e.tar.gz
>
> function test_build {
> ./configure --host=$HOST --build=`uname -m`-linux-gnu;
> - make && touch test_suite_ready || build_error "error while building test"
> + make
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.cyclictest/fuego_test.sh
> b/engine/tests/Benchmark.cyclictest/fuego_test.sh
> index 657de9b..2631a82 100755
> --- a/engine/tests/Benchmark.cyclictest/fuego_test.sh
> +++ b/engine/tests/Benchmark.cyclictest/fuego_test.sh
> @@ -1,7 +1,7 @@
> tarball=cyclictest.tar.gz
>
> function test_build {
> - make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP"
> CXXCPP="$CXXCPP" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" && touch
> test_suite_ready || build_error "error while building test"
> + make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP"
> CXXCPP="$CXXCPP" CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.dbench/fuego_test.sh
> b/engine/tests/Benchmark.dbench/fuego_test.sh
> index d84c820..f7160f9 100755
> --- a/engine/tests/Benchmark.dbench/fuego_test.sh
> +++ b/engine/tests/Benchmark.dbench/fuego_test.sh
> @@ -3,7 +3,7 @@ tarball=dbench-3.04.tar.gz
> function test_build {
> patch -N -s -p1 < $TEST_HOME/dbench_startup.patch
> ./configure --host=$HOST --build=`uname -m`-linux-gnu
> CFLAGS="$CFLAGS";
> - make && touch test_suite_ready || build_error "error while building test"
> + make
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.ebizzy/fuego_test.sh
> b/engine/tests/Benchmark.ebizzy/fuego_test.sh
> index 1e1e7ac..28b9fc0 100755
> --- a/engine/tests/Benchmark.ebizzy/fuego_test.sh
> +++ b/engine/tests/Benchmark.ebizzy/fuego_test.sh
> @@ -1,7 +1,7 @@
> tarball=ebizzy-0.3.tar.gz
>
> function test_build {
> - $CC -Wall -Wshadow -lpthread -o ebizzy ebizzy.c && touch
> test_suite_ready || build_error "error while building test"
> + $CC -Wall -Wshadow -lpthread -o ebizzy ebizzy.c
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.ffsb/fuego_test.sh
> b/engine/tests/Benchmark.ffsb/fuego_test.sh
> index 2037c8f..80a157d 100755
> --- a/engine/tests/Benchmark.ffsb/fuego_test.sh
> +++ b/engine/tests/Benchmark.ffsb/fuego_test.sh
> @@ -2,7 +2,7 @@ tarball=ffsb-6.0-rc2.tar.bz2
>
> function test_build {
> ./configure --host=$HOST --build=`uname -m`-linux-gnu CC=$CC AR=$AR
> RANLIB=$RANLIB CXX=$CXX CPP=$CPP CXXCPP=$CXXCPP
> CFLAGS="$CFLAGS";
> - make && touch test_suite_ready || build_error "error while building test"
> + make
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.fio/fuego_test.sh
> b/engine/tests/Benchmark.fio/fuego_test.sh
> index 344e445..039ec15 100755
> --- a/engine/tests/Benchmark.fio/fuego_test.sh
> +++ b/engine/tests/Benchmark.fio/fuego_test.sh
> @@ -14,7 +14,6 @@ function test_build {
> # >/dev/null
>
> make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP"
> CXXCPP="$CXXCPP"
> - touch ../test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.fuego_check_plots/fuego_test.sh
> b/engine/tests/Benchmark.fuego_check_plots/fuego_test.sh
> index 562b659..80e4999 100644
> --- a/engine/tests/Benchmark.fuego_check_plots/fuego_test.sh
> +++ b/engine/tests/Benchmark.fuego_check_plots/fuego_test.sh
> @@ -1,7 +1,3 @@
> -function test_build {
> - touch test_suite_ready
> -}
> -
> function test_deploy {
> return 0
> }
> diff --git a/engine/tests/Benchmark.gtkperf/fuego_test.sh
> b/engine/tests/Benchmark.gtkperf/fuego_test.sh
> index 07a4487..45b07bb 100755
> --- a/engine/tests/Benchmark.gtkperf/fuego_test.sh
> +++ b/engine/tests/Benchmark.gtkperf/fuego_test.sh
> @@ -9,7 +9,7 @@ function test_build {
> cd ..
> export PATH=/usr/local/bin:$PATH
> ./configure --prefix=$BOARD_TESTDIR/$TESTDIR --host=$HOST --
> build=`uname -m`-linux-gnu --target=$HOST
> - make && touch test_suite_ready || build_error "error while building test"
> + make
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.hackbench/fuego_test.sh
> b/engine/tests/Benchmark.hackbench/fuego_test.sh
> index 3b45dd3..385f533 100755
> --- a/engine/tests/Benchmark.hackbench/fuego_test.sh
> +++ b/engine/tests/Benchmark.hackbench/fuego_test.sh
> @@ -1,7 +1,7 @@
> tarball=hackbench.tar.gz
>
> function test_build {
> - $CC -lpthread hackbench.c -o hackbench && touch test_suite_ready ||
> build_error "error while building test"
> + $CC -lpthread hackbench.c -o hackbench
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.himeno/fuego_test.sh
> b/engine/tests/Benchmark.himeno/fuego_test.sh
> index debce2f..5ad2429 100755
> --- a/engine/tests/Benchmark.himeno/fuego_test.sh
> +++ b/engine/tests/Benchmark.himeno/fuego_test.sh
> @@ -2,7 +2,7 @@ tarball=himeno.tar.bz2
>
> function test_build {
> CFLAGS+=" -O3"
> - make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP"
> CXXCPP="$CXXCPP" CFLAGS="$CFLAGS" && touch test_suite_ready ||
> build_error "error while building test"
> + make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP"
> CXXCPP="$CXXCPP" CFLAGS="$CFLAGS"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.iperf/fuego_test.sh
> b/engine/tests/Benchmark.iperf/fuego_test.sh
> index 74b4437..ad19052 100755
> --- a/engine/tests/Benchmark.iperf/fuego_test.sh
> +++ b/engine/tests/Benchmark.iperf/fuego_test.sh
> @@ -5,7 +5,7 @@ function test_build {
> make config.h
> sed -i -e "s/#define HAVE_MALLOC 0/#define HAVE_MALLOC 1/g" -e
> "s/#define malloc rpl_malloc/\/\* #undef malloc \*\//g" config.h
> sed -i -e '/HEADERS\(\)/ a\#include "gnu_getopt.h"' src/Settings.cpp
> - make && touch test_suite_ready || build_error "error while building test"
> + make
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.linpack/fuego_test.sh
> b/engine/tests/Benchmark.linpack/fuego_test.sh
> index a42d665..98ac835 100755
> --- a/engine/tests/Benchmark.linpack/fuego_test.sh
> +++ b/engine/tests/Benchmark.linpack/fuego_test.sh
> @@ -2,7 +2,7 @@ tarball=linpack.tar.bz2
>
> function test_build {
> patch -p0 -N -s < $TEST_HOME/linpack.c.patch
> - $CC $CFLAGS -O -lm -o linpack linpack.c && touch test_suite_ready ||
> build_error "error while building test"
> + $CC $CFLAGS -O -lm -o linpack linpack.c
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.lmbench2/fuego_test.sh
> b/engine/tests/Benchmark.lmbench2/fuego_test.sh
> index 67d4afe..7dd56ca 100755
> --- a/engine/tests/Benchmark.lmbench2/fuego_test.sh
> +++ b/engine/tests/Benchmark.lmbench2/fuego_test.sh
> @@ -11,7 +11,7 @@ function test_build {
> patch -p0 < $TEST_HOME/bench.h.patch
> cd ..
> CFLAGS+=" -g -O"
> - make OS="$PREFIX" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX"
> CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS="$CFLAGS" && touch
> test_suite_ready || build_error "error while building test"
> + make OS="$PREFIX" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX"
> CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS="$CFLAGS"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.nbench-byte/fuego_test.sh
> b/engine/tests/Benchmark.nbench-byte/fuego_test.sh
> index 650b71f..d4a8336 100755
> --- a/engine/tests/Benchmark.nbench-byte/fuego_test.sh
> +++ b/engine/tests/Benchmark.nbench-byte/fuego_test.sh
> @@ -4,7 +4,7 @@ function test_build {
> patch -N -s -p0 < $TEST_HOME/nbench.Makefile.patch
> rm -f pointer.h && touch pointer.h
> CFLAGS+=" -s -static -Wall -O3"
> - make CFLAGS="${CFLAGS}" CC="$CC" AR="$AR" RANLIB="$RANLIB"
> CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" && touch test_suite_ready ||
> build_error "error while building test"
> + make CFLAGS="${CFLAGS}" CC="$CC" AR="$AR" RANLIB="$RANLIB"
> CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.nbench_byte/fuego_test.sh
> b/engine/tests/Benchmark.nbench_byte/fuego_test.sh
> index 42b78d1..2561951 100755
> --- a/engine/tests/Benchmark.nbench_byte/fuego_test.sh
> +++ b/engine/tests/Benchmark.nbench_byte/fuego_test.sh
> @@ -4,7 +4,7 @@ function test_build {
> patch -N -s -p0 < $TEST_HOME/nbench.Makefile.patch
> rm -f pointer.h && touch pointer.h
> CFLAGS+=" -s -static -Wall -O3"
> - make CFLAGS="${CFLAGS}" CC=$CC AR=$AR RANLIB=$RANLIB CXX=$CXX
> CPP=$CPP CXXCPP=$CXXCPP && touch test_suite_ready || build_error
> "error while building test"
> + make CFLAGS="${CFLAGS}" CC=$CC AR=$AR RANLIB=$RANLIB CXX=$CXX
> CPP=$CPP CXXCPP=$CXXCPP
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.netpipe/fuego_test.sh
> b/engine/tests/Benchmark.netpipe/fuego_test.sh
> index 732982e..a2f1a79 100755
> --- a/engine/tests/Benchmark.netpipe/fuego_test.sh
> +++ b/engine/tests/Benchmark.netpipe/fuego_test.sh
> @@ -2,7 +2,7 @@ tarball=NetPIPE-3.7.1.tar.gz
>
> function test_build {
> patch -p1 -N -s < ../../tarballs/netpipe-makefile.patch
> - make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" &&
> touch test_suite_ready || build_error "error while building test"
> + make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.signaltest/fuego_test.sh
> b/engine/tests/Benchmark.signaltest/fuego_test.sh
> index 7c0e3fb..fc57c23 100755
> --- a/engine/tests/Benchmark.signaltest/fuego_test.sh
> +++ b/engine/tests/Benchmark.signaltest/fuego_test.sh
> @@ -1,7 +1,7 @@
> tarball=signaltest.tar.gz
>
> function test_build {
> - make CC="$CC" LD="$LD" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS" &&
> touch test_suite_ready || build_error "error while building test"
> + make CC="$CC" LD="$LD" LDFLAGS="$LDFLAGS" CFLAGS="$CFLAGS"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.tiobench/fuego_test.sh
> b/engine/tests/Benchmark.tiobench/fuego_test.sh
> index a974859..f916335 100755
> --- a/engine/tests/Benchmark.tiobench/fuego_test.sh
> +++ b/engine/tests/Benchmark.tiobench/fuego_test.sh
> @@ -2,7 +2,7 @@ tarball=tiobench-0.3.3.tar.gz
>
> function test_build {
> patch -N -s -p1 < $TEST_HOME/tiobench-fix-conflicting-types.patch
> - make LINK="$CC" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX"
> CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS+="${CFLAGS}" && touch
> test_suite_ready || build_error "error while building test"
> + make LINK="$CC" CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX"
> CPP="$CPP" CXXCPP="$CXXCPP" CFLAGS+="${CFLAGS}"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Benchmark.x11perf/fuego_test.sh
> b/engine/tests/Benchmark.x11perf/fuego_test.sh
> index b706d2b..70209c1 100755
> --- a/engine/tests/Benchmark.x11perf/fuego_test.sh
> +++ b/engine/tests/Benchmark.x11perf/fuego_test.sh
> @@ -8,7 +8,7 @@ function test_build {
>
> ./configure $CONFIGURE_FLAGS X11PERF_LIBS="-lX11 -lXmu" # force to
> use libXmu instead of libXmuu
> sed -i 's#$(SED)#sed#' Makefile # this is wrong, but somewhy $(SED) in
> Makefile expands to nothing
> - make && touch test_suite_ready
> + make
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.LTP/fuego_test.sh
> b/engine/tests/Functional.LTP/fuego_test.sh
> index db5c4d8..f7c9ced 100755
> --- a/engine/tests/Functional.LTP/fuego_test.sh
> +++ b/engine/tests/Functional.LTP/fuego_test.sh
> @@ -89,8 +89,6 @@ function test_build {
>
> cp --parents testcases/realtime/scripts/setenv.sh `pwd`/target_bin/
> cp $TEST_HOME/ltp_target_run.sh `pwd`/target_bin/
> -
> - touch test_suite_ready
> else
> echo "Skipping LTP build"
> fi
> diff --git a/engine/tests/Functional.aiostress/fuego_test.sh
> b/engine/tests/Functional.aiostress/fuego_test.sh
> index 2bebb67..7418af9 100755
> --- a/engine/tests/Functional.aiostress/fuego_test.sh
> +++ b/engine/tests/Functional.aiostress/fuego_test.sh
> @@ -1,7 +1,7 @@
> tarball=aiostress.tar.gz
>
> function test_build {
> - $CC -I $SDKROOT/usr/include -L $SDKROOT/usr/lib -Wall -lpthread -laio
> aiostress.c -o aiostress && touch test_suite_ready || build_error "error
> while building test"
> + $CC -I $SDKROOT/usr/include -L $SDKROOT/usr/lib -Wall -lpthread -laio
> aiostress.c -o aiostress
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.bsdiff/fuego_test.sh
> b/engine/tests/Functional.bsdiff/fuego_test.sh
> index 48723c0..b84c259 100755
> --- a/engine/tests/Functional.bsdiff/fuego_test.sh
> +++ b/engine/tests/Functional.bsdiff/fuego_test.sh
> @@ -1,9 +1,5 @@
> tarball=bsdiff.tar.gz
>
> -function test_build {
> - touch test_suite_ready
> -}
> -
> function test_deploy {
> put data/*.modified data/*.original $BOARD_TESTDIR/fuego.$TESTDIR/;
> }
> diff --git a/engine/tests/Functional.bzip2/fuego_test.sh
> b/engine/tests/Functional.bzip2/fuego_test.sh
> index f5c75c5..2375b48 100755
> --- a/engine/tests/Functional.bzip2/fuego_test.sh
> +++ b/engine/tests/Functional.bzip2/fuego_test.sh
> @@ -22,7 +22,6 @@ function test_build {
> if cmp sample3.bz2 sample3.rb2; then echo 'TEST-9 OK'; else echo 'TEST-9
> FAILED'; fi;
> if cmp sample1.tst sample1.ref; then echo 'TEST-10 OK'; else echo 'TEST-10
> FAILED'; fi;
> if cmp sample2.tst sample2.ref; then echo 'TEST-11 OK'; else echo 'TEST-11
> FAILED'; fi;" > run-tests.sh
> - touch test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.cmt/fuego_test.sh
> b/engine/tests/Functional.cmt/fuego_test.sh
> index 5a0482d..fc662b3 100755
> --- a/engine/tests/Functional.cmt/fuego_test.sh
> +++ b/engine/tests/Functional.cmt/fuego_test.sh
> @@ -1,9 +1,5 @@
> tarball=dung-3.4.25-m2.tar.gz
>
> -function test_build {
> - touch test_suite_ready
> -}
> -
> function test_deploy {
> put ./* $BOARD_TESTDIR/fuego.$TESTDIR/
> }
> diff --git a/engine/tests/Functional.crashme/fuego_test.sh
> b/engine/tests/Functional.crashme/fuego_test.sh
> index f0aea34..66fa374 100755
> --- a/engine/tests/Functional.crashme/fuego_test.sh
> +++ b/engine/tests/Functional.crashme/fuego_test.sh
> @@ -2,7 +2,7 @@ tarball=crashme_2.4.tar.bz2
>
> function test_build {
> patch -p1 -N -s < $TEST_HOME/crashme_2.4-9.patch
> - make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" &&
> touch test_suite_ready || build_error "error while building test"
> + make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.curl/fuego_test.sh
> b/engine/tests/Functional.curl/fuego_test.sh
> index 945e0e2..81059d8 100755
> --- a/engine/tests/Functional.curl/fuego_test.sh
> +++ b/engine/tests/Functional.curl/fuego_test.sh
> @@ -1,7 +1,3 @@
> -function test_build {
> - touch test_suite_ready
> -}
> -
> function test_deploy {
> true
> }
> diff --git a/engine/tests/Functional.expat/fuego_test.sh
> b/engine/tests/Functional.expat/fuego_test.sh
> index 5a0f4f5..8a84d89 100755
> --- a/engine/tests/Functional.expat/fuego_test.sh
> +++ b/engine/tests/Functional.expat/fuego_test.sh
> @@ -14,8 +14,8 @@ function test_build {
>
> CXXFLAGS='-I. -I./lib -g -O2'
> ./configure --build=`uname -m`-gnu-linux --host="$PREFIX" #CC="$CC"
> AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
> - make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP"
> CXXCPP="$CXXCPP" 1>/dev/null
> - make CFLAGS="$CFLAGS" CC="$CC" CXX=$PREFIX-g++ CXX="$CXX"
> CXXFLAGS="$CXXFLAGS" tests/runtestspp; 1>/dev/null && touch
> test_suite_ready || build_error "error while building test"
> + make CC="$CC" AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP"
> CXXCPP="$CXXCPP" || return
> + make CFLAGS="$CFLAGS" CC="$CC" CXX=$PREFIX-g++ CXX="$CXX"
> CXXFLAGS="$CXXFLAGS" tests/runtestspp
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.fixesproto/fuego_test.sh
> b/engine/tests/Functional.fixesproto/fuego_test.sh
> index 86919b9..cebd40c 100755
> --- a/engine/tests/Functional.fixesproto/fuego_test.sh
> +++ b/engine/tests/Functional.fixesproto/fuego_test.sh
> @@ -6,8 +6,6 @@ function test_build {
> if [ -f /usr/include/X11/extensions/xfixeswire.h ]; then echo 'TEST-2 OK';
> else echo 'TEST-2 FAIL'; fi;
> if [ -f /usr/lib/pkgconfig/fixesproto.pc ]; then echo 'TEST-3 OK'; else echo
> 'TEST-3 FAIL'; fi;
> " > run-tests.sh
> -
> - touch test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.fuego_abort/fuego_test.sh
> b/engine/tests/Functional.fuego_abort/fuego_test.sh
> index b7cab8e..84f0a42 100755
> --- a/engine/tests/Functional.fuego_abort/fuego_test.sh
> +++ b/engine/tests/Functional.fuego_abort/fuego_test.sh
> @@ -9,10 +9,6 @@ function test_pre_check {
> echo "This test has pid $$"
> }
>
> -function test_build {
> - touch test_suite_ready
> -}
> -
> function test_deploy {
> true
> }
> diff --git a/engine/tests/Functional.fuego_board_check/fuego_test.sh
> b/engine/tests/Functional.fuego_board_check/fuego_test.sh
> index 580d623..972c46e 100755
> --- a/engine/tests/Functional.fuego_board_check/fuego_test.sh
> +++ b/engine/tests/Functional.fuego_board_check/fuego_test.sh
> @@ -2,10 +2,6 @@
>
> tarfile=scan_for_items.sh
>
> -function test_build {
> - touch test_suite_ready
> -}
> -
> function test_deploy {
> put $TEST_HOME/scan_for_items.sh $BOARD_TESTDIR/fuego.$TESTDIR/
> }
> diff --git a/engine/tests/Functional.fuego_test_phases/fuego_test.sh
> b/engine/tests/Functional.fuego_test_phases/fuego_test.sh
> index 80251c9..8834a3a 100755
> --- a/engine/tests/Functional.fuego_test_phases/fuego_test.sh
> +++ b/engine/tests/Functional.fuego_test_phases/fuego_test.sh
> @@ -14,7 +14,6 @@ function test_pre_check {
>
> function test_build {
> PHASE_STR="${PHASE_STR}:test_build"
> - touch test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.glib/fuego_test.sh
> b/engine/tests/Functional.glib/fuego_test.sh
> index c346f05..cbeb35f 100755
> --- a/engine/tests/Functional.glib/fuego_test.sh
> +++ b/engine/tests/Functional.glib/fuego_test.sh
> @@ -8,7 +8,7 @@ function test_build {
> ./configure --prefix=`pwd`/build --cache-file=config.cross --host=$HOST --
> target=$HOST --build=`uname -m`-linux-gnu CC="$CC" AR="$AR"
> RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
> CXXFLAGS="$CXXFLAGS"
> make 2>&1
> cd tests && make test; cd -
> - cd glib/tests && make test; cd - && touch test_suite_ready || build_error
> "error while building test"
> + cd glib/tests && make test; cd -
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.glibc/fuego_test.sh
> b/engine/tests/Functional.glibc/fuego_test.sh
> index e387900..6e3213c 100755
> --- a/engine/tests/Functional.glibc/fuego_test.sh
> +++ b/engine/tests/Functional.glibc/fuego_test.sh
> @@ -39,7 +39,6 @@ EOF
> then echo 'TEST-14 OK'; else echo 'TEST-14 FAIL'; fi;
> " > run-tests.sh
>
> - touch test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.hello_world/fuego_test.sh
> b/engine/tests/Functional.hello_world/fuego_test.sh
> index 27a8344..9c9a394 100755
> --- a/engine/tests/Functional.hello_world/fuego_test.sh
> +++ b/engine/tests/Functional.hello_world/fuego_test.sh
> @@ -3,7 +3,7 @@
> tarball=hello-test-1.1.tgz
>
> function test_build {
> - make && touch test_suite_ready || build_error "error while building
> test"
> + make
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.imagemagick/fuego_test.sh
> b/engine/tests/Functional.imagemagick/fuego_test.sh
> index 3f1c69f..b21eb77 100755
> --- a/engine/tests/Functional.imagemagick/fuego_test.sh
> +++ b/engine/tests/Functional.imagemagick/fuego_test.sh
> @@ -44,7 +44,6 @@ function test_build {
> # if ./djpeg -dct int -ppm -outfile testout.ppm testorig.jpg; then echo 'TEST-
> 1 OK'; else echo 'TEST-1 FAIL'; fi;
> # " > run-tests.sh
>
> - touch test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.ipv6connect/fuego_test.sh
> b/engine/tests/Functional.ipv6connect/fuego_test.sh
> index bcda1f3..c6fdd05 100755
> --- a/engine/tests/Functional.ipv6connect/fuego_test.sh
> +++ b/engine/tests/Functional.ipv6connect/fuego_test.sh
> @@ -1,7 +1,7 @@
> tarball=ipv6connect.tar.gz
>
> function test_build {
> - make CC="$CC" LD="$LD" && touch test_suite_ready || build_error
> "error while building test"
> + make CC="$CC" LD="$LD"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.jpeg/fuego_test.sh
> b/engine/tests/Functional.jpeg/fuego_test.sh
> index 55f34d6..2cbc237 100755
> --- a/engine/tests/Functional.jpeg/fuego_test.sh
> +++ b/engine/tests/Functional.jpeg/fuego_test.sh
> @@ -16,7 +16,6 @@ function test_build {
> if cmp testimg.ppm testoutp.ppm; then echo 'TEST-10 OK'; else echo
> 'TEST-10 FAIL'; fi;
> if cmp testimgp.jpg testoutp.jpg; then echo 'TEST-11 OK'; else echo 'TEST-
> 11 FAIL'; fi;
> if cmp testorig.jpg testoutt.jpg; then echo 'TEST-12 OK'; else echo 'TEST-12
> FAIL'; fi;" > run-tests.sh
> - touch test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.libtar/fuego_test.sh
> b/engine/tests/Functional.libtar/fuego_test.sh
> index 06ef34b..2fcc01f 100755
> --- a/engine/tests/Functional.libtar/fuego_test.sh
> +++ b/engine/tests/Functional.libtar/fuego_test.sh
> @@ -22,7 +22,6 @@ function test_build {
> else
> echo 'TEST-3 FAILED'
> fi" > run-tests.sh
> - touch test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.linus_stress/fuego_test.sh
> b/engine/tests/Functional.linus_stress/fuego_test.sh
> index b5b2afb..a03debd 100755
> --- a/engine/tests/Functional.linus_stress/fuego_test.sh
> +++ b/engine/tests/Functional.linus_stress/fuego_test.sh
> @@ -1,7 +1,7 @@
> tarball=linus_stress.tar.gz
>
> function test_build {
> - make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" &&
> touch test_suite_ready || build_error "error while building test"
> + make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.lwip/fuego_test.sh
> b/engine/tests/Functional.lwip/fuego_test.sh
> index d5c8c80..17d15af 100755
> --- a/engine/tests/Functional.lwip/fuego_test.sh
> +++ b/engine/tests/Functional.lwip/fuego_test.sh
> @@ -29,7 +29,6 @@ function test_build {
> killall sntp_test
>
> " > run-tests.sh
> - touch test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.pi_tests/fuego_test.sh
> b/engine/tests/Functional.pi_tests/fuego_test.sh
> index de6057e..c3240cc 100755
> --- a/engine/tests/Functional.pi_tests/fuego_test.sh
> +++ b/engine/tests/Functional.pi_tests/fuego_test.sh
> @@ -2,7 +2,7 @@ gitrepo=https://github.com/clrkwllms/rt-tests.git
>
> function test_build {
> cd rt-tests/
> - make CC="$CC" LD="$LD" NUMA=0 pi_stress && touch test_suite_ready
> || build_error "error while building test"
> + make CC="$CC" LD="$LD" NUMA=0 pi_stress
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.pixman/fuego_test.sh
> b/engine/tests/Functional.pixman/fuego_test.sh
> index 7999b0d..a8cd6dd 100755
> --- a/engine/tests/Functional.pixman/fuego_test.sh
> +++ b/engine/tests/Functional.pixman/fuego_test.sh
> @@ -190,7 +190,6 @@ function test_build {
> echo 'TEST-30 FAILED'
> fi
> " > run-tests.sh
> - touch test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.pppd/fuego_test.sh
> b/engine/tests/Functional.pppd/fuego_test.sh
> index a622f95..d080871 100755
> --- a/engine/tests/Functional.pppd/fuego_test.sh
> +++ b/engine/tests/Functional.pppd/fuego_test.sh
> @@ -22,7 +22,6 @@ function test_build {
> killall ppp_response
> # killall pppd
> " > run-tests.sh
> - touch test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.protobuf/fuego_test.sh
> b/engine/tests/Functional.protobuf/fuego_test.sh
> index 57037d3..2c6cfcb 100755
> --- a/engine/tests/Functional.protobuf/fuego_test.sh
> +++ b/engine/tests/Functional.protobuf/fuego_test.sh
> @@ -27,7 +27,6 @@ function test_build {
> else
> echo 'TEST-4 FAILED'
> fi" > run-tests.sh
> - touch test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.rmaptest/fuego_test.sh
> b/engine/tests/Functional.rmaptest/fuego_test.sh
> index 69e08b0..84e360b 100755
> --- a/engine/tests/Functional.rmaptest/fuego_test.sh
> +++ b/engine/tests/Functional.rmaptest/fuego_test.sh
> @@ -1,7 +1,7 @@
> tarball=rmaptest.tar.gz
>
> function test_build {
> - make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" &&
> touch test_suite_ready || build_error "error while building test"
> + make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.scifab/fuego_test.sh
> b/engine/tests/Functional.scifab/fuego_test.sh
> index d874964..418e947 100755
> --- a/engine/tests/Functional.scifab/fuego_test.sh
> +++ b/engine/tests/Functional.scifab/fuego_test.sh
> @@ -1,9 +1,5 @@
> tarball=dung-3.4.25-m2.tar.gz
>
> -function test_build {
> - touch test_suite_ready
> -}
> -
> function test_deploy {
> put ./* $OSV_HOME/osv.$TESTDIR/
> }
> diff --git a/engine/tests/Functional.scrashme/fuego_test.sh
> b/engine/tests/Functional.scrashme/fuego_test.sh
> index d173e47..aabb779 100755
> --- a/engine/tests/Functional.scrashme/fuego_test.sh
> +++ b/engine/tests/Functional.scrashme/fuego_test.sh
> @@ -1,19 +1,19 @@
> tarball=scrashme.tar.bz2
>
> function test_pre_check {
> - assert_define FUNCTIONAL_SCRASHME_NUM
> - assert_define FUNCTIONAL_SCRASHME_MODE
> + assert_define FUNCTIONAL_SCRASHME_NUM
> + assert_define FUNCTIONAL_SCRASHME_MODE
> }
>
> function test_build {
> patch -p1 -N -s < $TEST_HOME/scrashme-testfix.patch
> - make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" &&
> touch test_suite_ready || build_error "error while building test"
> + make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD"
> }
>
> function test_deploy {
> - put scrashme $BOARD_TESTDIR/fuego.$TESTDIR/
> + put scrashme $BOARD_TESTDIR/fuego.$TESTDIR/
> }
>
> function test_run {
> - report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./scrashme --
> mode=$FUNCTIONAL_SCRASHME_MODE -
> N$FUNCTIONAL_SCRASHME_NUM"
> + report "cd $BOARD_TESTDIR/fuego.$TESTDIR; ./scrashme --
> mode=$FUNCTIONAL_SCRASHME_MODE -
> N$FUNCTIONAL_SCRASHME_NUM"
> }
> diff --git a/engine/tests/Functional.sdhi_0/fuego_test.sh
> b/engine/tests/Functional.sdhi_0/fuego_test.sh
> index b290808..b3cee43 100755
> --- a/engine/tests/Functional.sdhi_0/fuego_test.sh
> +++ b/engine/tests/Functional.sdhi_0/fuego_test.sh
> @@ -1,9 +1,5 @@
> tarball=dung-3.4.25-m2.tar.gz
>
> -function test_build {
> - touch test_suite_ready
> -}
> -
> function test_deploy {
> put ./* $OSV_HOME/osv.$TESTDIR/
> }
> diff --git a/engine/tests/Functional.stress/fuego_test.sh
> b/engine/tests/Functional.stress/fuego_test.sh
> index e9c467f..11bcfe1 100755
> --- a/engine/tests/Functional.stress/fuego_test.sh
> +++ b/engine/tests/Functional.stress/fuego_test.sh
> @@ -2,7 +2,7 @@ tarball=stress-1.0.4.tar.gz
>
> function test_build {
> ./configure --host=$HOST --build=`uname -m`-linux-gnu CC="$CC"
> AR="$AR" RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP"
> CFLAGS="$CFLAGS";
> - make && touch test_suite_ready || build_error "error while building test"
> + make
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.synctest/fuego_test.sh
> b/engine/tests/Functional.synctest/fuego_test.sh
> index aff0820..95d4dda 100755
> --- a/engine/tests/Functional.synctest/fuego_test.sh
> +++ b/engine/tests/Functional.synctest/fuego_test.sh
> @@ -1,7 +1,7 @@
> tarball=synctest.tar.gz
>
> function test_build {
> - make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD" &&
> touch test_suite_ready || build_error "error while building test"
> + make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" CC="$CC" LD="$LD"
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.thrift/fuego_test.sh
> b/engine/tests/Functional.thrift/fuego_test.sh
> index 8310e4e..17a8c11 100755
> --- a/engine/tests/Functional.thrift/fuego_test.sh
> +++ b/engine/tests/Functional.thrift/fuego_test.sh
> @@ -111,7 +111,6 @@ function test_build {
>
> killall CppServer
> " > run-tests.sh
> - touch test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.xorg-macros/fuego_test.sh
> b/engine/tests/Functional.xorg-macros/fuego_test.sh
> index 95490be..df10fcd 100755
> --- a/engine/tests/Functional.xorg-macros/fuego_test.sh
> +++ b/engine/tests/Functional.xorg-macros/fuego_test.sh
> @@ -6,7 +6,6 @@ function test_build {
> if [ -f /usr/share/pkgconfig/xorg-macros.pc ]; then echo 'TEST-2 OK'; else
> echo 'TEST-2 FAIL'; fi;
> " > run-tests.sh
>
> - touch test_suite_ready
> }
>
> function test_deploy {
> diff --git a/engine/tests/Functional.zlib/fuego_test.sh
> b/engine/tests/Functional.zlib/fuego_test.sh
> index 7615b5d..c794c52 100755
> --- a/engine/tests/Functional.zlib/fuego_test.sh
> +++ b/engine/tests/Functional.zlib/fuego_test.sh
> @@ -4,7 +4,7 @@ function test_build {
> AR=$PREFIX'-ar rc'
> CPP=$PREFIX'-gcc -E'
> CC="$CC" AR="$AR" CPP="$CPP" ./configure --
> includedir=$SDKROOT/usr/include --libdir=$SDKROOT/usr/lib
> - make LDSHARED="$CC" >/dev/null && touch test_suite_ready ||
> build_error "error while building test"
> + make LDSHARED="$CC" >/dev/null
> }
>
> function test_deploy {
> diff --git a/engine/tests/OpenSSL/openssl.sh
> b/engine/tests/OpenSSL/openssl.sh
> index 95848a7..ec062c7 100755
> --- a/engine/tests/OpenSSL/openssl.sh
> +++ b/engine/tests/OpenSSL/openssl.sh
> @@ -51,5 +51,4 @@ function test_build {
> ../util/shlib_wrap.sh ./shatest
> ../util/shlib_wrap.sh ./ssltest' > run-tests.sh
> rm test/fips_aes_data
> - touch test_suite_ready || build_error "error while building test"
> }
> diff --git a/engine/tests/netperf/netperf.sh
> b/engine/tests/netperf/netperf.sh
> index 2cd6da4..8c14cff 100755
> --- a/engine/tests/netperf/netperf.sh
> +++ b/engine/tests/netperf/netperf.sh
> @@ -1,6 +1,6 @@
> function test_build {
> echo "ac_cv_func_setpgrp_void=yes" > config.cache
> ./configure --build=`./config.guess` --host=$HOST CC="$CC" AR="$AR"
> RANLIB="$RANLIB" CXX="$CXX" CPP="$CPP" CXXCPP="$CXXCPP" --config-
> cache
> - make && touch test_suite_ready || build_error "error while building test"
> + make
> }
>
> --
> 2.7.4
>
>
> _______________________________________________
> Fuego mailing list
> Fuego at lists.linuxfoundation.org
> https://lists.linuxfoundation.org/mailman/listinfo/fuego
More information about the Fuego
mailing list