diff options
| author | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-07 14:00:32 (GMT) |
|---|---|---|
| committer | Daniel Narvaez <dwnarvaez@gmail.com> | 2012-11-07 14:00:32 (GMT) |
| commit | d2c852a71b03a243affe905d1041e43a9f55c3f5 (patch) | |
| tree | 09edb4ac4777c1904a6c72b40d007cd8a8e686ff | |
| parent | 3eb071ea41d7f064fb92ce76c865d99d3cb55fdd (diff) | |
More dogtail -> ui-tests renaming
| -rwxr-xr-x | scripts/run-ui-tests | 11 | ||||
| -rw-r--r-- | scripts/xinitrc | 6 |
2 files changed, 5 insertions, 12 deletions
diff --git a/scripts/run-ui-tests b/scripts/run-ui-tests index ddf126a..11eff62 100755 --- a/scripts/run-ui-tests +++ b/scripts/run-ui-tests @@ -8,13 +8,6 @@ logsdir=$rootdir/logs display=`$scriptsdir/find-free-display` resolution=1024x768x16 -minver="0.8.0" -version=`python -c "import dogtail; print dogtail.__version__"` -if [ "$minver" != "`echo -e "$minver\n$version" | sort -V | head -n1`" ]; then - echo "Dogtail >= 0.8.0 is required." - exit 0 -fi - xvfb=`which Xvfb` xserver="$xvfb $display -ac -noreset -shmem -screen 0 $resolution" @@ -24,7 +17,7 @@ fi export SUGAR_LOGGER_LEVEL=debug export GTK_MODULES=gail:atk-bridge -export SUGAR_DOGTAIL=yes +export SUGAR_UI_TESTS=yes xinit $scriptsdir/xinitrc -- $xserver & xinitpid=$! @@ -42,7 +35,7 @@ else LOGFILE=$logsdir/test.log fi -cd ~/.sugar/dogtail/logs +cd ~/.sugar/ui-tests/logs for logfile in *.log do diff --git a/scripts/xinitrc b/scripts/xinitrc index 9dfc388..aa4da72 100644 --- a/scripts/xinitrc +++ b/scripts/xinitrc @@ -40,9 +40,9 @@ if [ ! -z $RESOLUTION ]; then xrandr -s $RESOLUTION fi -if [ ! -z $SUGAR_DOGTAIL ]; then - rm -rf ~/.sugar/dogtail - export SUGAR_PROFILE=dogtail +if [ ! -z $SUGAR_UI_TESTS ]; then + rm -rf ~/.sugar/ui-tests + export SUGAR_PROFILE=ui-tests elif [ ! -z $PROFILE ]; then export SUGAR_PROFILE=$PROFILE fi |