diff options
| author | QC <qball@gmpclient.org> | 2014-11-06 21:03:13 +0100 |
|---|---|---|
| committer | QC <qball@gmpclient.org> | 2014-11-06 21:03:13 +0100 |
| commit | 5d48004011e963d445ed521aee84e6b1b9aa548f (patch) | |
| tree | 83cb8d1caaac0ee9d018f468e010fbe059f6b429 /test | |
| parent | 2e0d79d73eade82fde994ef5a83e9e99a1e908de (diff) | |
Playing with test. adding xresources.
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 14 | ||||
| -rwxr-xr-x | test/run_test.sh | 4 |
2 files changed, 11 insertions, 7 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index 257b98fa..6823e837 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -44,10 +44,10 @@ helper_test_SOURCES=\ test: ${bin_PROGRAMS} ./rofi_test ./helper_test - $(top_srcdir)/test/run_test.sh 123 $(top_builddir)/test/textbox_test $(top_builddir) - $(top_srcdir)/test/run_test.sh 200 $(top_srcdir)/test/run_errormsg_test.sh $(top_builddir) - $(top_srcdir)/test/run_test.sh 201 $(top_srcdir)/test/run_switchdialog_test.sh $(top_builddir) - $(top_srcdir)/test/run_test.sh 202 $(top_srcdir)/test/run_dmenu_test.sh $(top_builddir) - $(top_srcdir)/test/run_test.sh 203 $(top_srcdir)/test/run_dmenu_custom_test.sh $(top_builddir) - $(top_srcdir)/test/run_test.sh 204 $(top_srcdir)/test/run_run_test.sh $(top_builddir) - $(top_srcdir)/test/run_test.sh 205 $(top_srcdir)/test/run_script_test.sh $(top_builddir) + $(top_srcdir)/test/run_test.sh 123 $(top_builddir)/test/textbox_test $(top_builddir) $(top_srcdir)/doc/example.xresources + $(top_srcdir)/test/run_test.sh 200 $(top_srcdir)/test/run_errormsg_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources + $(top_srcdir)/test/run_test.sh 201 $(top_srcdir)/test/run_switchdialog_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources + $(top_srcdir)/test/run_test.sh 202 $(top_srcdir)/test/run_dmenu_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources + $(top_srcdir)/test/run_test.sh 203 $(top_srcdir)/test/run_dmenu_custom_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources + $(top_srcdir)/test/run_test.sh 204 $(top_srcdir)/test/run_run_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources + $(top_srcdir)/test/run_test.sh 205 $(top_srcdir)/test/run_script_test.sh $(top_builddir) $(top_srcdir)/doc/example.xresources diff --git a/test/run_test.sh b/test/run_test.sh index 2f4751d7..425ca96c 100755 --- a/test/run_test.sh +++ b/test/run_test.sh @@ -26,6 +26,10 @@ then fi create_fake_x "$1" +if [ -n "$4" ] +then + xrdb -load "$4" +fi echo "$DISPLAY" $2 RES=$? |