changeset 1110:716ad74e0598

Make smoketest.sh more efficient, no need to create hdb.img or use run-from-build.sh.
author Rob Landley <rob@landley.net>
date Sun, 13 Jun 2010 02:47:49 -0500
parents f5b13cbc77d7
children 6b20e20bb291
files smoketest.sh sources/more/timeout.sh
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/smoketest.sh	Fri Jun 11 14:00:11 2010 -0500
+++ b/smoketest.sh	Sun Jun 13 02:47:49 2010 -0500
@@ -13,7 +13,7 @@
 # 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.
 
-SKIP_HOME=1 sources/more/timeout.sh 60 ./run-from-build.sh $1 << 'EOF'
+sources/more/timeout.sh 60 cd build/system-image-$1 "&&" ./run-emulator.sh << 'EOF'
           #
 # Show free space
 df
--- a/sources/more/timeout.sh	Fri Jun 11 14:00:11 2010 -0500
+++ b/sources/more/timeout.sh	Sun Jun 13 02:47:49 2010 -0500
@@ -17,4 +17,4 @@
 trap "killtree $$" EXIT
 TIMEOUT="$1"
 shift
-( "$@" ) | tee >(while read -t "$TIMEOUT" -n 32 i; do true; done; sleep 1; kill -TERM $$ 2>/dev/null )
+( eval "$@" ) | tee >(while read -t "$TIMEOUT" -n 32 i; do true; done; sleep 1; kill -TERM $$ 2>/dev/null )