diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/Makefile.am | 3 | ||||
| -rw-r--r-- | test/xserver-test.cpp | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/test/Makefile.am b/test/Makefile.am index cab7cf7..a1f94cb 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -55,7 +55,8 @@ process_test_helper_SOURCES = process-test-helper.cpp process_test_helper_CPPFLAGS = $(AM_CPPFLAGS) xserver_test_SOURCES = xserver-test.cpp -xserver_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/include +xserver_test_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/include \ + -DDUMMY_CONF_PATH="\"$(top_srcdir)/data/xorg/gtest/dummy.conf\"" xserver_test_LDADD = $(tests_libraries) xserver_test_helper_SOURCES = xserver-test-helper.cpp diff --git a/test/xserver-test.cpp b/test/xserver-test.cpp index e41267d..70402fc 100644 --- a/test/xserver-test.cpp +++ b/test/xserver-test.cpp @@ -20,6 +20,7 @@ TEST(XServer, LogRemoval) XServer server; server.SetOption("-logfile", logfile); + server.SetOption("-config", DUMMY_CONF_PATH); server.Start(); server.Terminate(3000); server.RemoveLogFile(); @@ -63,6 +64,7 @@ TEST(XServer, WaitForSIGUSR1) for (int i = 0; i < 20; i++) { XServer server; server.SetOption("-logfile", "/tmp/xorg-testing-xserver-sigusr1.log"); + server.SetOption("-config", DUMMY_CONF_PATH); server.SetOption("-noreset", ""); server.Start(); ASSERT_EQ(server.GetState(), Process::RUNNING); @@ -103,6 +105,7 @@ TEST(XServer, WaitForDeviceEventMask) XServer server; server.SetOption("-logfile", "/tmp/Xorg-WaitForDevice.log"); + server.SetOption("-config", DUMMY_CONF_PATH); server.SetOption("-noreset", ""); server.Start(); ASSERT_EQ(server.GetState(), Process::RUNNING); @@ -165,6 +168,7 @@ TEST(XServer, WaitForExistingDevice) XServer server; server.SetOption("-logfile", "/tmp/Xorg-WaitForDevice.log"); + server.SetOption("-config", DUMMY_CONF_PATH); server.SetOption("-noreset", ""); server.Start(); ASSERT_EQ(server.GetState(), Process::RUNNING); @@ -180,6 +184,7 @@ TEST(XServer, WaitForNewDevice) XServer server; server.SetOption("-logfile", "/tmp/Xorg-WaitForDevice.log"); + server.SetOption("-config", DUMMY_CONF_PATH); server.SetOption("-noreset", ""); server.Start(); ASSERT_EQ(server.GetState(), Process::RUNNING); @@ -197,6 +202,7 @@ TEST(XServer, IOErrorException) ASSERT_THROW({ XServer server; server.SetOption("-logfile", "/tmp/xorg-io-error-test.log"); + server.SetOption("-config", DUMMY_CONF_PATH); server.SetOption("-noreset", ""); server.Start(); ASSERT_EQ(server.GetState(), Process::RUNNING); @@ -224,6 +230,7 @@ TEST(XServer, KeepAlive) XServer server; server.SetOption("-logfile", "/tmp/Xorg-keepalive.log"); + server.SetOption("-config", DUMMY_CONF_PATH); server.SetOption("-noreset", ""); server.Start(); ASSERT_EQ(server.GetState(), Process::RUNNING); @@ -278,6 +285,7 @@ TEST(XServer, RemoveOption) { XServer server; server.SetOption("-fail", "yes"); + server.SetOption("-logfile", "/tmp/Xorg-remove-option.log"); server.Start(TEST_ROOT_DIR "/xserver-test-helper"); ASSERT_EQ(server.GetState(), Process::FINISHED_FAILURE); |