Update test

This commit is contained in:
Dave Davenport 2015-12-31 23:02:13 +01:00
parent c5258f9b51
commit e102e11637
3 changed files with 6 additions and 8 deletions

View file

@ -191,7 +191,7 @@ test-x: ${bin_PROGRAMS}
echo "Test daemon"
$(top_srcdir)/test/run_test.sh 211 $(top_srcdir)/test/run_daemon_test.sh $(top_builddir)
echo "Test xr dump"
$(top_srcdir)/test/run_test.sh 212 $(top_srcdir)/test/xr_dump_test.sh $(top_builddir)
$(top_srcdir)/test/run_test.sh 212 $(top_srcdir)/test/xr_dump_test.sh $(top_builddir) $(top_srcdir)
echo "End tests"

View file

@ -26,12 +26,8 @@ then
fi
create_fake_x "$1"
if [ -n "$4" ]
then
xrdb -load -retain "$4"
fi
echo "$DISPLAY"
$2
$2 $4
RES=$?
destroy_fake_x

View file

@ -1,9 +1,11 @@
#!/usr/bin/env bash
xrdb -retain -load ../doc/test_xr.txt
TOP_DIR=$1
xrdb -retain -load ${TOP_DIR}/doc/test_xr.txt
rofi -dump-xresources > temp.txt
if ! diff temp.txt ../doc/test_xr.txt > /dev/null
if ! diff temp.txt ${TOP_DIR}/doc/test_xr.txt > /dev/null
then
echo "Dump xresources does not match."
exit 1;