diff options
| author | Peter Hutterer <peter.hutterer@who-t.net> | 2012-10-10 06:59:29 +1000 |
|---|---|---|
| committer | Peter Hutterer <peter.hutterer@who-t.net> | 2012-10-10 06:59:29 +1000 |
| commit | 71cbb43ed2ee38e42ebf4a2c613d099eb49d5961 (patch) | |
| tree | 920a2f259947417a4a368588589b476254144dcb | |
| parent | 8fc974c89a08125dbc4e7380a2c620f9247bb0a2 (diff) | |
video/video-module-load: ignore exception if XOpenDisplay() failsgoogletest-merge
This is a module load test only, if SetUp() throws an exception because it
can't connect to the display, nothing bad happens.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | tests/video/video-module-load.cpp | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/tests/video/video-module-load.cpp b/tests/video/video-module-load.cpp index 51862fe..7398f31 100644 --- a/tests/video/video-module-load.cpp +++ b/tests/video/video-module-load.cpp @@ -7,7 +7,18 @@ #include "video-driver-test.h" -TEST_P(SimpleVideoDriverTest, DriverDevice) +class VideoModuleLoadTest : public SimpleVideoDriverTest { +public: + virtual void SetUp() { + try { + SimpleVideoDriverTest::SetUp(); + } catch (std::runtime_error &e) { + /* We don't care if SetUp() can't connect to the display */ + } + } +}; + +TEST_P(VideoModuleLoadTest, DriverDevice) { std::ifstream in_file(server.GetLogFilePath().c_str()); std::string line; @@ -27,7 +38,7 @@ TEST_P(SimpleVideoDriverTest, DriverDevice) } } -INSTANTIATE_TEST_CASE_P(, SimpleVideoDriverTest, +INSTANTIATE_TEST_CASE_P(, VideoModuleLoadTest, ::testing::Values("ati", "cirrus", "dummy", "fbdev", "geode", "imx", "intel", "mga", "modesetting", "nv", "qxl", |