summaryrefslogtreecommitdiffstats
path: root/test
diff options
context:
space:
mode:
authorDave Davenport <qball@gmpclient.org>2015-12-31 23:02:13 +0100
committerDave Davenport <qball@gmpclient.org>2015-12-31 23:02:13 +0100
commite102e116379012de382927bd24cfc87f006c553b (patch)
tree61fb3a7b7bad9fa12ec903046563711c987bdd8e /test
parentc5258f9b51f605e9355bdf80b77714aa8f56b168 (diff)
Update test
Diffstat (limited to 'test')
-rwxr-xr-xtest/run_test.sh6
-rwxr-xr-xtest/xr_dump_test.sh6
2 files changed, 5 insertions, 7 deletions
diff --git a/test/run_test.sh b/test/run_test.sh
index 7cbad895..dc1f13e1 100755
--- a/test/run_test.sh
+++ b/test/run_test.sh
@@ -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
diff --git a/test/xr_dump_test.sh b/test/xr_dump_test.sh
index 990a82c3..b3d4f067 100755
--- a/test/xr_dump_test.sh
+++ b/test/xr_dump_test.sh
@@ -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;