diff options
| -rwxr-xr-x | commands/helpers/test | 13 | ||||
| -rwxr-xr-x | commands/test | 4 |
2 files changed, 9 insertions, 8 deletions
diff --git a/commands/helpers/test b/commands/helpers/test index 077abca..a2ea227 100755 --- a/commands/helpers/test +++ b/commands/helpers/test @@ -1,11 +1,8 @@ #!/bin/sh -helpersdir=`dirname "$0"` -commandsdir=`dirname "$helpersdir"` -rootdir=`dirname "$commandsdir"` -runnerhelpersdir=$rootdir/install/libexec/sugar-runner -testsdir=$rootdir/tests -logsdir=$rootdir/logs +helpersdir=$SUGAR_BUILD_DIR/install/libexec/sugar-runner +testsdir=$SUGAR_BUILD_DIR/tests +logsdir=$SUGAR_BUILD_DIR/logs display=`$helpersdir/find-free-display` resolution=1024x768x16 @@ -20,7 +17,7 @@ export SUGAR_LOGGER_LEVEL=debug export GTK_MODULES=gail:atk-bridge export SUGAR_PROFILE=uitests -xinit $runnerhelpersdir/xinitrc -- $xserver & +xinit $helpersdir/xinitrc -- $xserver & xinitpid=$! sleep 5 @@ -45,6 +42,6 @@ do echo >> $LOGFILE done -#rm -rf ~/.sugar/uitests +rm -rf ~/.sugar/uitests exit $result diff --git a/commands/test b/commands/test index 6a18454..ff4f107 100755 --- a/commands/test +++ b/commands/test @@ -5,6 +5,10 @@ import os import common from devbot import run +from devbot import config common.setup() + +os.environ["SUGAR_BUILD_DIR"] = os.path.join(common.base_dir) + run.run([os.path.join(common.helpers_dir, "test")]) |