Aire-One
/
awesome
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'test-runner-for-bisect' of https://github.com/blueyed/awesome

This commit is contained in:
Uli Schlachter 2015-10-10 19:52:11 +02:00
parent b89918d0f1 fa1dea6df4
commit a66517bb75
1 changed files with 28 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
tests/run.sh
View File

@ -1,4 +1,14 @@
#!/bin/sh #!/bin/sh
#
# Test runner.
#
# This can also be used to start awesome from the build directory, e.g. for
# git-bisect:
# 1. Put the file into a subdirectory, which is ignored by git, e.g.
# `tmp/run.sh`.
# 2. Run it from the source root (after `make`):
# env TEST_PAUSE_ON_ERRORS=1 sh tmp/run.sh
# It should start Xephyr and launch awesome in it, using the default config.
set -e set -e
@ -27,10 +37,10 @@ if [ "$CI" = true ]; then
TEST_QUIT_ON_TIMEOUT=1 TEST_QUIT_ON_TIMEOUT=1
else else
HEADLESS=0 HEADLESS=0
TEST_PAUSE_ON_ERRORS=0 TEST_PAUSE_ON_ERRORS=${TEST_PAUSE_ON_ERRORS-0}
TEST_QUIT_ON_TIMEOUT=1 TEST_QUIT_ON_TIMEOUT=1
fi fi
export TEST_PAUSE_ON_ERRORS export TEST_PAUSE_ON_ERRORS # Used in tests/_runner.lua.
XEPHYR=Xephyr XEPHYR=Xephyr
XVFB=Xvfb XVFB=Xvfb
@ -115,12 +125,16 @@ eval $(DISPLAY="$D" dbus-launch --sh-syntax --exit-with-session)
# Not in Travis? # Not in Travis?
if [ "$CI" != true ]; then if [ "$CI" != true ]; then
# Prepare a config file pointing to a working theme # Prepare a config file pointing to a working theme
# Handle old filename of config files (useful for git-bisect).
if [ -f $root_dir/awesomerc.lua.in ]; then
SED_IN=.in
fi
RC_FILE=$tmp_files/awesomerc.lua RC_FILE=$tmp_files/awesomerc.lua
THEME_FILE=$tmp_files/theme.lua THEME_FILE=$tmp_files/theme.lua
sed -e "s:beautiful.init(\"@AWESOME_THEMES_PATH@/default/theme.lua\"):beautiful.init('$THEME_FILE'):" $root_dir/awesomerc.lua > $RC_FILE sed -e "s:beautiful.init(\"@AWESOME_THEMES_PATH@/default/theme.lua\"):beautiful.init('$THEME_FILE'):" $root_dir/awesomerc.lua$SED_IN > $RC_FILE
sed -e "s:@AWESOME_THEMES_PATH@/default/titlebar:$root_dir/build/themes/default/titlebar:" \ sed -e "s:@AWESOME_THEMES_PATH@/default/titlebar:$root_dir/build/themes/default/titlebar:" \
-e "s:@AWESOME_THEMES_PATH@:$root_dir/themes/:" \ -e "s:@AWESOME_THEMES_PATH@:$root_dir/themes/:" \
-e "s:@AWESOME_ICON_PATH@:$root_dir/icons:" $root_dir/themes/default/theme.lua > $THEME_FILE -e "s:@AWESOME_ICON_PATH@:$root_dir/icons:" $root_dir/themes/default/theme.lua$SED_IN > $THEME_FILE
fi fi
# Start awesome. # Start awesome.
@ -141,14 +155,14 @@ errors=0
for f in $tests; do for f in $tests; do
echo "== Running $f ==" echo "== Running $f =="
start_awesome
if [ ! -r $f ]; then if [ ! -r $f ]; then
echo "===> ERROR $f is not readable! <===" echo "===> ERROR $f is not readable! <==="
errors=$(expr $errors + 1) errors=$(expr $errors + 1)
continue continue
fi fi
start_awesome
# Send the test file to awesome. # Send the test file to awesome.
cat $f | DISPLAY=$D "$AWESOME_CLIENT" 2>&1 cat $f | DISPLAY=$D "$AWESOME_CLIENT" 2>&1
@ -159,12 +173,14 @@ for f in $tests; do
echo "===> ERROR running $f! <===" echo "===> ERROR running $f! <==="
grep --color -o --binary-files=text -E '^Error.*|.*assertion failed.*' $awesome_log grep --color -o --binary-files=text -E '^Error.*|.*assertion failed.*' $awesome_log
errors=$(expr $errors + 1) errors=$(expr $errors + 1)
fi
done
if ! [ $errors = 0 ]; then
if [ "$TEST_PAUSE_ON_ERRORS" = 1 ]; then if [ "$TEST_PAUSE_ON_ERRORS" = 1 ]; then
echo "Pausing... press Enter to continue." echo "Pausing... press Enter to continue."
read enter read enter
fi fi
fi exit 1
done fi
exit 0
[ $errors = 0 ] && exit 0 || exit 1