[Fuego] [PATCH 01/10] rebuild: fixes to the rebuild flag and more

Daniel Sangorrin daniel.sangorrin at toshiba.co.jp
Fri Apr 28 08:28:23 UTC 2017 

This patch adds the following functionality:
 - It fixes the rebuild flag which wasn't working properly.
   Now it is, and it's really helpful not to have to rebuild
   LTP all the time, so I'm making it a default.
 - I removed the concurrent_check because I think that
   should be something external. Currently, Jenkins
   executes jobs for a specific board serially so we
   don't need to care about it. In the future, when I add
 - I splitted the pre_test and added a FUEGO_LAZY_LINK
   variable. If that variable is defined, then the link
   is stablished just before deploying the test and running.
 - I removed any reference to test_suite_ready from all tests
   and substituted that with a single line in functions.
 - I removed any reference to build_error and now errors
   are handled properly by build.

Sorry, too much changes but I didn't have time to split the
patch properly.

Signed-off-by: Daniel Sangorrin <daniel.sangorrin at toshiba.co.jp>
---
 engine/scripts/ftc                                 |   3 +-
 engine/scripts/functions.sh                        | 164 ++++++++-------------
 engine/scripts/main.sh                             |   4 +-
 engine/tests/Benchmark.Dhrystone/fuego_test.sh     |   2 +-
 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          |   1 -
 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      |   1 -
 engine/tests/Benchmark.gtkperf/fuego_test.sh       |   1 -
 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          |   1 -
 engine/tests/Functional.aiostress/fuego_test.sh    |   2 +-
 engine/tests/Functional.bsdiff/fuego_test.sh       |   1 -
 engine/tests/Functional.bzip2/fuego_test.sh        |   1 -
 engine/tests/Functional.cmt/fuego_test.sh          |   1 -
 engine/tests/Functional.crashme/fuego_test.sh      |   2 +-
 engine/tests/Functional.curl/fuego_test.sh         |   1 -
 engine/tests/Functional.expat/fuego_test.sh        |   2 +-
 engine/tests/Functional.fixesproto/fuego_test.sh   |   2 -
 engine/tests/Functional.ft2demos/fuego_test.sh     |   2 +-
 engine/tests/Functional.fuego_abort/fuego_test.sh  |   1 -
 .../Functional.fuego_board_check/fuego_test.sh     |   1 -
 .../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       |   1 -
 engine/tests/Functional.scrashme/fuego_test.sh     |   2 +-
 engine/tests/Functional.sdhi_0/fuego_test.sh       |   1 -
 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 +-
 68 files changed, 103 insertions(+), 175 deletions(-)

diff --git a/engine/scripts/ftc b/engine/scripts/ftc
index e173d5b..e8c1608 100755
--- a/engine/scripts/ftc
+++ b/engine/scripts/ftc
@@ -846,6 +846,7 @@ export TESTDIR={testdir}
 export TESTNAME={testname}
 export TESTSPEC={testspec}
 #export FUEGO_DEBUG=1
+#export FUEGO_LAZY_LINK=1
 timeout --signal=9 {timeout} /bin/bash $FUEGO_CORE/engine/scripts/main.sh
 </command>
     </hudson.tasks.Shell>
@@ -1023,7 +1024,7 @@ def do_add_jobs(conf, options):
         'timeout' : '30m',
         'spec'    : 'default',
         'reboot'  : 'false',
-        'rebuild' : 'true',
+        'rebuild' : 'false',
         'precleanup'  : 'true',
         'postcleanup' : 'true'
     }
diff --git a/engine/scripts/functions.sh b/engine/scripts/functions.sh
index 3bc6a1c..a4658f5 100755
--- a/engine/scripts/functions.sh
+++ b/engine/scripts/functions.sh
@@ -40,25 +40,39 @@ set -o errtrace
 # $1 - optional flag; if set to "nostrip",
 #      the leading path components won't be stripped
 function unpack {
-    [ "$1" = "nostrip" ] && strip_opt= || strip_opt="--strip-components=1"
-
     if [ ! -z ${tarball+x} ]; then
+        [ "$1" = "nostrip" ] && strip_opt= || strip_opt="--strip-components=1"
+
+        # FIXTHIS: check that this works, and do the same for gitrepo
+        upName=`echo "${JOB_NAME^^}"| tr '.' '_'`
+        spec_tarball="${upName}_TARBALL_NAME"
+
+        if [ ! -z "${!spec_tarball}" ]; then
+            echo "Using $spec_tarball=${!spec_tarball} from test spec"
+            tarball=${!spec_tarball}
+        fi
+
         case ${tarball/*./} in
             gz|tgz) key=z ;;
             bz2) key=j ;;
             tar) key= ;;
-            *) echo "Unknown $tarball file format. Not unpacking."; return;;
+            *) echo "Unknown $tarball file format. Not unpacking."; return 1;;
         esac
         tar ${key}xf $TEST_HOME/$tarball $strip_opt
+        return $?
     fi
 
     if [ ! -z ${gitrepo+x} ]; then
         if [ -z ${gitbranch+x} ]; then
             gitbranch="master"
         fi
-	# FIXTHIS: support commit ids (log and checkout)
-        git clone --depth=1 --branch=$gitbranch $gitrepo
+        # FIXTHIS: support commit ids (log and checkout)
+        git clone --depth=1 --branch=$gitbranch $gitrepo .
+        return $?
     fi
+
+    echo "Warning: No tarball or gitrepo definition. Make sure the test handles that."
+    return 0
 }
 
 function is_empty {
@@ -148,103 +162,45 @@ function dump_syslogs {
   ov_rootfs_logread "$@"
 }
 
-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 ]
-    do
-      sleep 5
-    done
-  fi
-
-  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.
-# $1 is passed directly to unpack().
+# $1 is passed directly to 'unpack'.
+# Returns 1 on error
 function pre_build {
-  cd ${WORKSPACE}
-  upName=`echo "${JOB_NAME^^}"| tr '.' '_'`
-  spec_tarball="${upName}_TARBALL_NAME"
-
-  if [ ! -z "${!spec_tarball}" ]
-  then
-      echo "Using $spec_tarball=${!spec_tarball} from test spec"
-      tarball=${!spec_tarball}
-  fi
+    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 *
+    if [ "$Rebuild" = "false" ]; then
+        if [ -e fuego_test_succesfully_built ]; then
+            echo "The test is already built"
+            return 0
+        fi
     fi
 
-    if [ ! -e test_suite_ready ]; then
-      unpack $1
-      return 0
-    fi
-  fi
-  return 1
+    rm -rf *
+    unpack $1
 }
 
 function build {
-  pre_build $1
-  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
-}
-
-function post_build {
-  true
-}
-
-function deploy {
-  echo "##### doing fuego phase: pre_deploy ########"
-  pre_deploy
-  echo "##### doing fuego phase: test_deploy ########"
-  test_deploy
-  echo "##### doing fuego phase: post_deploy ########"
-  post_deploy
-}
+    pre_build $1 || abort_job "ERROR: pre_build failed"
 
-function pre_deploy {
-  cd "$WORKSPACE"
-  if [ ! -e "$TRIPLET" ]; then
-    if build; then
-      echo "Test builded(looks like first time)"
-      cd $WORKSPACE/$TRIPLET
+    if [ -e fuego_test_succesfully_built ]; then
+        build_duration=0
     else
-      echo -e "Error reason: unable to change dir to $TRIPLET"
+        build_start_time=$(date +"%s.%N")
+        # Don't abort on fail because we want to 'process' it
+        call_if_present test_build || echo "ERROR: test_build failed"
+        build_end_time=$(date +"%s.%N")
+        build_duration=$(python -c "print $build_end_time - $build_start_time")
+        touch fuego_test_succesfully_built
     fi
-  elif [ -e "$TRIPLET/build_failed" ]; then
-      echo "Seems the test failed to build last time. Rebuilding"
-
-      if build; then
-          cd $WORKSPACE/$TRIPLET
-      fi
-  else
-    cd  $TRIPLET
-  fi
+    echo "Fuego test_build duration=$build_duration seconds"
 }
 
-function post_deploy {
-  rm -f $LOCKFILE
+function deploy {
+    pre_deploy
+    cd $WORKSPACE/$TRIPLET
+    call_if_present test_deploy
 }
 
 function firmware {
@@ -263,32 +219,36 @@ function target_setup_route_to_host () {
 }
 
 function pre_test {
-    # Make sure the target is alive, and prepare workspace for the test
     source $FUEGO_RO/toolchains/tools.sh
     export SSHPASS=$PASSWORD
+    export LOGDIR="$FUEGO_RW/logs/$TESTDIR/${NODE_NAME}.${TESTSPEC}.${BUILD_NUMBER}.${BUILD_ID}"
 
     is_empty $TESTDIR
 
-    # Setup routing to target if needed
-    [ -n "$TARGET_SETUP_LINK" ] && $TARGET_SETUP_LINK
-
-    cmd "true" || abort_job "Cannot connect to $DEVICE via $TRANSPORT"
+    if [ ! -z ${FUEGO_LAZY_LINK+x} ]; then
+        return 0
+    else
+        [ -n "$TARGET_SETUP_LINK" ] && $TARGET_SETUP_LINK
+            # Make sure the target is alive
+            cmd "true" || abort_job "Cannot connect to $DEVICE via $TRANSPORT"
+            call_if_present test_pre_check
+        [ -n "$TARGET_TEARDOWN_LINK" ] && $TARGET_TEARDOWN_LINK
+    fi
+}
 
+function pre_deploy {
     # Target cleanup flag check
     [ "$Target_PreCleanup" = "true" ] && target_cleanup $TESTDIR || true
 
-    export LOGDIR="$FUEGO_RW/logs/$TESTDIR/${NODE_NAME}.${TESTSPEC}.${BUILD_NUMBER}.${BUILD_ID}"
-
-    # call test_pre_check if defined
-    call_if_present test_pre_check
+    # Make sure the target is alive (again)
+    cmd "true" || abort_job "Cannot connect to $DEVICE via $TRANSPORT"
 
     # Get target device firmware.
     firmware
     cmd "echo \"Firmware revision:\" $FWVER" || abort_job "Error while ROOTFS_FWVER command execution on target"
 
-    # XXX: Sync date/time between target device and framework host
-    # Also log memory and disk status as well as non-kernel processes,and interrupts
-
+    # FIXTHIS: Sync date/time between target device and framework host
+    # FIXTHIS: log memory and disk status as well as non-kernel processes,and interrupts
     ov_rootfs_state
 
     cmd "if [ ! -d $BOARD_TESTDIR ]; then mkdir -p $BOARD_TESTDIR; fi" || abort_job "ERROR: cannot find nor create $BOARD_TESTDIR"
@@ -309,7 +269,6 @@ function pre_test {
 
     # flush buffers to physical media and drop filesystem caches to make system load more predictable during test execution
     ov_rootfs_sync
-
     ov_rootfs_drop_caches
 }
 
@@ -549,8 +508,6 @@ function target_reboot {
   # for target come back up
   sleep 10
 
-  # set +e because cmd will fail during the boot process
-  set +e
   retries=0
   while [ $retries -le $1 ]
   do
@@ -559,7 +516,6 @@ function target_reboot {
     sleep 1
     retries=$((retries+1));
   done
-  set -e
   abort_job "FAIL: reboot retries exhausted\n"
 }
 
diff --git a/engine/scripts/main.sh b/engine/scripts/main.sh
index 597049a..a09bb20 100644
--- a/engine/scripts/main.sh
+++ b/engine/scripts/main.sh
@@ -35,9 +35,7 @@ echo "##### doing fuego phase: pre_test ########"
 pre_test
 
 echo "##### doing fuego phase: build ########"
-if $Rebuild; then
-    build
-fi
+build
 
 echo "##### doing fuego phase: deploy ########"
 deploy
diff --git a/engine/tests/Benchmark.Dhrystone/fuego_test.sh b/engine/tests/Benchmark.Dhrystone/fuego_test.sh
index bc3f4c8..120cafe 100755
--- a/engine/tests/Benchmark.Dhrystone/fuego_test.sh
+++ b/engine/tests/Benchmark.Dhrystone/fuego_test.sh
@@ -8,7 +8,7 @@ function test_build {
     patch -p0 -N -s < $TEST_HOME/dhry_1.c.patch || return 1
     CFLAGS+=" -DTIME"
     LDFLAGS+=" -lm"
-    make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" && touch test_suite_ready || return 1
+    make CFLAGS="$CFLAGS" LDFLAGS="$LDFLAGS" || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.GLMark/fuego_test.sh b/engine/tests/Benchmark.GLMark/fuego_test.sh
index f409109..19e16f7 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 || return 1
 #               -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..471e5b2 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" || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.Interbench/fuego_test.sh b/engine/tests/Benchmark.Interbench/fuego_test.sh
index 5f950e2..e3259b5 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" || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.Java/fuego_test.sh b/engine/tests/Benchmark.Java/fuego_test.sh
index b0483d2..9214fb8 100755
--- a/engine/tests/Benchmark.Java/fuego_test.sh
+++ b/engine/tests/Benchmark.Java/fuego_test.sh
@@ -1,7 +1,6 @@
 tarball=java_perf.tar
 
 function test_build {
-    touch test_suite_ready
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.Stream/fuego_test.sh b/engine/tests/Benchmark.Stream/fuego_test.sh
index ddeb26c..398664f 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" || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.Whetstone/fuego_test.sh b/engine/tests/Benchmark.Whetstone/fuego_test.sh
index 925bfcb..82da186 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" || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.aim7/fuego_test.sh b/engine/tests/Benchmark.aim7/fuego_test.sh
index 2cee552..a2e587c 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 || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.blobsallad/fuego_test.sh b/engine/tests/Benchmark.blobsallad/fuego_test.sh
index ed5273d..e49a34d 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"  || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.bonnie/fuego_test.sh b/engine/tests/Benchmark.bonnie/fuego_test.sh
index 562088a..fcdd3a5 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 || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.cyclictest/fuego_test.sh b/engine/tests/Benchmark.cyclictest/fuego_test.sh
index 657de9b..70dc9a2 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" || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.dbench/fuego_test.sh b/engine/tests/Benchmark.dbench/fuego_test.sh
index d84c820..177cae3 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 || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.ebizzy/fuego_test.sh b/engine/tests/Benchmark.ebizzy/fuego_test.sh
index 1e1e7ac..c199662 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 || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.ffsb/fuego_test.sh b/engine/tests/Benchmark.ffsb/fuego_test.sh
index 2037c8f..8e1202c 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 || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.fio/fuego_test.sh b/engine/tests/Benchmark.fio/fuego_test.sh
index 212ed62..a6672d2 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..5b980d2 100644
--- a/engine/tests/Benchmark.fuego_check_plots/fuego_test.sh
+++ b/engine/tests/Benchmark.fuego_check_plots/fuego_test.sh
@@ -1,5 +1,4 @@
 function test_build {
-    touch test_suite_ready
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.gtkperf/fuego_test.sh b/engine/tests/Benchmark.gtkperf/fuego_test.sh
index 20e9a29..082360e 100755
--- a/engine/tests/Benchmark.gtkperf/fuego_test.sh
+++ b/engine/tests/Benchmark.gtkperf/fuego_test.sh
@@ -10,7 +10,6 @@ function test_build {
 	export PATH=/usr/local/bin:$PATH
         ./configure --prefix=$BOARD_TESTDIR/$TESTDIR --host=$HOST --build=`uname -m`-linux-gnu --target=$HOST
         make
-    # || { cd src; $CC -o .libs/gtkperf support.o main.o interface.o callbacks.o tests.o timing.o  -L${SDKROOT}/usr/lib ${SDKROOT}/usr/lib/libgtk-x11-2.0.so ${SDKROOT}/usr/lib/libatk-1.0.so ${SDKROOT}/usr/lib/libgio-2.0.so ${SDKROOT}/usr/lib/libpangoft2-1.0.so ${SDKROOT}/usr/lib/libfreetype.so ${SDKROOT}/usr/lib/libfontconfig.so ${SDKROOT}/usr/lib/libgdk-x11-2.0.so ${SDKROOT}/usr/lib/libgdk_pixbuf-2.0.so ${SDKROOT}/usr/lib/libpangocairo-1.0.so ${SDKROOT}/usr/lib/libpango-1.0.so ${SDKROOT}/usr/lib/libcairo.so ${SDKROOT}/usr/lib/libgobject-2.0.so ${SDKROOT}/usr/lib/libgmodule-2.0.so ${SDKROOT}/usr/lib/libglib-2.0.so -Wl,--rpath -Wl,${SDKROOT}/usr/lib -Wl,--sysroot=${SDKROOT}; } && touch ../test_suite_ready || build_error "error while building test"
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.hackbench/fuego_test.sh b/engine/tests/Benchmark.hackbench/fuego_test.sh
index 3b45dd3..c53211e 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 || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.himeno/fuego_test.sh b/engine/tests/Benchmark.himeno/fuego_test.sh
index debce2f..9f877f6 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" || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.iperf/fuego_test.sh b/engine/tests/Benchmark.iperf/fuego_test.sh
index 74b4437..213c3f3 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 || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.linpack/fuego_test.sh b/engine/tests/Benchmark.linpack/fuego_test.sh
index a42d665..bd0d5b9 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 || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.lmbench2/fuego_test.sh b/engine/tests/Benchmark.lmbench2/fuego_test.sh
index 67d4afe..b3b8540 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" || return 1
 }
 
 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..156dd4b 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" || return 1
 }
 
 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..dce329e 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 || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.netpipe/fuego_test.sh b/engine/tests/Benchmark.netpipe/fuego_test.sh
index 17b5ed5..a70d75d 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" || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.signaltest/fuego_test.sh b/engine/tests/Benchmark.signaltest/fuego_test.sh
index 7c0e3fb..2f67d67 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" || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Benchmark.tiobench/fuego_test.sh b/engine/tests/Benchmark.tiobench/fuego_test.sh
index a974859..75dc0ba 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}" || return 1
 }
 
 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..c6c50dc 100755
--- a/engine/tests/Functional.LTP/fuego_test.sh
+++ b/engine/tests/Functional.LTP/fuego_test.sh
@@ -90,7 +90,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..d239fd9 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 || return 1 
 }
 
 function test_deploy {
diff --git a/engine/tests/Functional.bsdiff/fuego_test.sh b/engine/tests/Functional.bsdiff/fuego_test.sh
index 48723c0..cd9ab31 100755
--- a/engine/tests/Functional.bsdiff/fuego_test.sh
+++ b/engine/tests/Functional.bsdiff/fuego_test.sh
@@ -1,7 +1,6 @@
 tarball=bsdiff.tar.gz
 
 function test_build {
-    touch test_suite_ready
 }
 
 function test_deploy {
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..ea5c2e1 100755
--- a/engine/tests/Functional.cmt/fuego_test.sh
+++ b/engine/tests/Functional.cmt/fuego_test.sh
@@ -1,7 +1,6 @@
 tarball=dung-3.4.25-m2.tar.gz
 
 function test_build  {
-    touch test_suite_ready
 }
 
 function test_deploy {
diff --git a/engine/tests/Functional.crashme/fuego_test.sh b/engine/tests/Functional.crashme/fuego_test.sh
index f0aea34..5c5583a 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" || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Functional.curl/fuego_test.sh b/engine/tests/Functional.curl/fuego_test.sh
index bdd3d88..f64e6e9 100755
--- a/engine/tests/Functional.curl/fuego_test.sh
+++ b/engine/tests/Functional.curl/fuego_test.sh
@@ -1,5 +1,4 @@
 function test_build {
-   touch test_suite_ready
 }
 
 function test_deploy {
diff --git a/engine/tests/Functional.expat/fuego_test.sh b/engine/tests/Functional.expat/fuego_test.sh
index 5a0f4f5..626d352 100755
--- a/engine/tests/Functional.expat/fuego_test.sh
+++ b/engine/tests/Functional.expat/fuego_test.sh
@@ -15,7 +15,7 @@ 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 CFLAGS="$CFLAGS" CC="$CC" CXX=$PREFIX-g++ CXX="$CXX"  CXXFLAGS="$CXXFLAGS" tests/runtestspp; 1>/dev/null || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Functional.fixesproto/fuego_test.sh b/engine/tests/Functional.fixesproto/fuego_test.sh
index 8521368..3d09eb3 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.ft2demos/fuego_test.sh b/engine/tests/Functional.ft2demos/fuego_test.sh
index e9ea078..9d42f77 100755
--- a/engine/tests/Functional.ft2demos/fuego_test.sh
+++ b/engine/tests/Functional.ft2demos/fuego_test.sh
@@ -23,7 +23,7 @@ function test_build {
     cd ../${tarball%.tar*}
     patch -N -s -p0 < $TEST_HOME/ft2demos.Makefile.patch
     export PATH=/usr/local/bin/:$PATH
-    SDKROOT=$SDKROOT CC=$CC AR=$AR RANLIB=$RANLIB CXX=$CXX CPP=$CPP CXXCPP=$CXXCPP LD=$LD make && touch ../test_suite_ready || build_error "error while building test"
+    SDKROOT=$SDKROOT CC=$CC AR=$AR RANLIB=$RANLIB CXX=$CXX CPP=$CPP CXXCPP=$CXXCPP LD=$LD make || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Functional.fuego_abort/fuego_test.sh b/engine/tests/Functional.fuego_abort/fuego_test.sh
index 6865052..3eb7254 100755
--- a/engine/tests/Functional.fuego_abort/fuego_test.sh
+++ b/engine/tests/Functional.fuego_abort/fuego_test.sh
@@ -12,7 +12,6 @@ function test_pre_check {
 }
 
 function test_build {
-    touch test_suite_ready
 }
 
 function test_deploy {
diff --git a/engine/tests/Functional.fuego_board_check/fuego_test.sh b/engine/tests/Functional.fuego_board_check/fuego_test.sh
index 2374ae4..7c0b60f 100755
--- a/engine/tests/Functional.fuego_board_check/fuego_test.sh
+++ b/engine/tests/Functional.fuego_board_check/fuego_test.sh
@@ -3,7 +3,6 @@
 tarfile=scan_for_items.sh
 
 function test_build {
-    touch test_suite_ready
 }
 
 function test_deploy {
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..e04ce78 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 - || return 1
 }
 
 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..deeabfb 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 || return 1
 }
 
 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..c75b9ac 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" || return 1
 }
 
 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..27d43c9 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" || return 1
 }
 
 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..b847229 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 || return 1
 }
 
 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..cba4d57 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" || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Functional.scifab/fuego_test.sh b/engine/tests/Functional.scifab/fuego_test.sh
index d874964..14519a8 100755
--- a/engine/tests/Functional.scifab/fuego_test.sh
+++ b/engine/tests/Functional.scifab/fuego_test.sh
@@ -1,7 +1,6 @@
 tarball=dung-3.4.25-m2.tar.gz
 
 function test_build  {
-    touch test_suite_ready
 }
 
 function test_deploy {
diff --git a/engine/tests/Functional.scrashme/fuego_test.sh b/engine/tests/Functional.scrashme/fuego_test.sh
index 0e8d855..25f4d1f 100755
--- a/engine/tests/Functional.scrashme/fuego_test.sh
+++ b/engine/tests/Functional.scrashme/fuego_test.sh
@@ -7,7 +7,7 @@ function test_pre_check {
 
 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" || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Functional.sdhi_0/fuego_test.sh b/engine/tests/Functional.sdhi_0/fuego_test.sh
index b290808..f7354b3 100755
--- a/engine/tests/Functional.sdhi_0/fuego_test.sh
+++ b/engine/tests/Functional.sdhi_0/fuego_test.sh
@@ -1,7 +1,6 @@
 tarball=dung-3.4.25-m2.tar.gz
 
 function test_build  {
-    touch test_suite_ready
 }
 
 function test_deploy {
diff --git a/engine/tests/Functional.stress/fuego_test.sh b/engine/tests/Functional.stress/fuego_test.sh
index e9c467f..5732361 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 || return 1
 }
 
 function test_deploy {
diff --git a/engine/tests/Functional.synctest/fuego_test.sh b/engine/tests/Functional.synctest/fuego_test.sh
index aff0820..a76caac 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" || return 1
 }
 
 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..9c91440 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 || return 1
 }
 
 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..96df43a 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 || return 1
 }
 
-- 
2.7.4

More information about the Fuego mailing list