[Aboriginal] Patch: fix smoketest timeout behaviour with FORK=1

Patrick Lauer patrick at gentoo.org
Tue Oct 1 04:25:41 PDT 2013


This patch makes the timeout for smoketest configurable and increases
the limit when FORK=1

This is needed even on fast machines - on a 3.4Ghz quadcore I get
timeouts for sparc, ppc reliably and other targets randomly.

With 180sec = 3 minutes it reliably finishes even when all are started
in parallel, increasing to 5 minutes or even more might be reasonable.


--- ../aboriginal-1.2.5_clone/more/smoketest.sh 2013-09-12
17:21:16.000000000 +0800
+++ more/smoketest.sh   2013-09-23 16:20:15.002910667 +0800
@@ -11,6 +11,8 @@
 # If you cat your own script into emulator-build.sh, you probably also need
 # to start with a line of spaces like that.  Just FYI.

+$TIMEOUT=${TIMEOUT:-60}
+
 sayhello()
 {
   sleep 10
@@ -22,4 +24,4 @@
   sleep 1
   echo exit
 }
-sayhello | more/timeout.sh 60 more/run-emulator-from-build.sh "$1"
+sayhello | more/timeout.sh ${TIMEOUT} more/run-emulator-from-build.sh "$1"

--- ../aboriginal-1.2.5_clone/more/smoketest-all.sh     2013-09-12
17:21:16.000000000 +0800
+++ more/smoketest-all.sh       2013-09-23 16:23:10.615505571 +0800
@@ -3,6 +3,10 @@
 # Run smoketest script on every build/system-image-* architecture.

 # If $FORK is set, run them in parallel.
+# If $FORK is set increase timeout from default 60sec
+
+[ -z "$FORK" ] && TIMEOUT=180
+

 . sources/utility_functions.sh || exit 1



More information about the Aboriginal mailing list