From c7749aeaeafa217c838b65a3848548647aa06e89 Mon Sep 17 00:00:00 2001
From: Daniel Narvaez <dwnarvaez@gmail.com>
Date: Wed, 28 Nov 2012 01:47:32 +0000
Subject: Generalize a bit how the test command is run

We should be able to use the same logic for other services.
---
(limited to 'commands/helpers')

diff --git a/commands/helpers/test b/commands/helpers/test
index a2ea227..4037a0d 100755
--- a/commands/helpers/test
+++ b/commands/helpers/test
@@ -1,9 +1,8 @@
 #!/bin/sh
 
-helpersdir=$SUGAR_BUILD_DIR/install/libexec/sugar-runner
-testsdir=$SUGAR_BUILD_DIR/tests
-logsdir=$SUGAR_BUILD_DIR/logs
-display=`$helpersdir/find-free-display`
+libexecdir=$SB_LIBEXEC_DIR
+logsdir=$SB_LOGS_DIR
+display=`$libexecdir/sugar-runner/find-free-display`
 resolution=1024x768x16
 
 xvfb=`which Xvfb`
@@ -17,12 +16,12 @@ export SUGAR_LOGGER_LEVEL=debug
 export GTK_MODULES=gail:atk-bridge
 export SUGAR_PROFILE=uitests
 
-xinit $helpersdir/xinitrc -- $xserver &
+xinit $libexecdir/sugar-runner/xinitrc -- $xserver &
 xinitpid=$!
 
 sleep 5
 
-DISPLAY=$display python -u $testsdir/shell.py
+DISPLAY=$display python -u $1
 result=$?
 
 kill $xinitpid
--
cgit v0.9.1