From 953e656562c2178a21880fc6cd5e43788994872a Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Feb 2010 12:01:22 -0800 Subject: Adding in run-xvfb.sh --- tests/Makefile.am | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 7fcccb6..97b3919 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -10,6 +10,9 @@ lib_LTLIBRARIES = \ libdummy-indicator-simple.la DBUS_RUNNER=dbus-test-runner --dbus-config /usr/share/dbus-test-runner/session.conf +XVFB_RUN=". $(srcdir)/run-xvfb.sh" + +EXTRA_DIST = run-xvfb.sh ############################# # Test Loader @@ -298,6 +301,7 @@ HTML_REPORT = loader-check-results.html loader-tester: test-loader libdummy-indicator-null.la libdummy-indicator-simple.la Makefile @echo "#!/bin/sh" > loader-tester + @echo $(XVFB_RUN) >> $@ @echo gtester -k --verbose -o=$(XML_REPORT) ./test-loader >> loader-tester @chmod +x loader-tester -- cgit v1.2.3 From 9719ffe24211ceaa5e4e3445bae8d5e172c5667f Mon Sep 17 00:00:00 2001 From: Ted Gould Date: Tue, 2 Feb 2010 12:10:23 -0800 Subject: Switching to 'bash' --- tests/Makefile.am | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'tests/Makefile.am') diff --git a/tests/Makefile.am b/tests/Makefile.am index 97b3919..b111655 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -300,7 +300,7 @@ XML_REPORT = loader-check-results.xml HTML_REPORT = loader-check-results.html loader-tester: test-loader libdummy-indicator-null.la libdummy-indicator-simple.la Makefile - @echo "#!/bin/sh" > loader-tester + @echo "#!/bin/bash" > loader-tester @echo $(XVFB_RUN) >> $@ @echo gtester -k --verbose -o=$(XML_REPORT) ./test-loader >> loader-tester @chmod +x loader-tester -- cgit v1.2.3