Allows calls like server.SetOption("-noreset");
Signed-off-by: Peter Hutterer <[email protected]>
---
examples/xorg-gtest-environment-example.cpp | 18 ++++++++++++++++++
examples/xorg-gtest-example.cpp | 18 ------------------
include/xorg/gtest/xorg-gtest-xserver.h | 2 +-
3 files changed, 19 insertions(+), 19 deletions(-)
create mode 100644 examples/xorg-gtest-environment-example.cpp
delete mode 100644 examples/xorg-gtest-example.cpp
diff --git a/examples/xorg-gtest-environment-example.cpp
b/examples/xorg-gtest-environment-example.cpp
new file mode 100644
index 0000000..4e9b6bb
--- /dev/null
+++ b/examples/xorg-gtest-environment-example.cpp
@@ -0,0 +1,18 @@
+#include <xorg/gtest/xorg-gtest.h>
+
+using namespace xorg::testing;
+
+/**
+ * @example xorg-gtest-example.cpp
+ *
+ * This is an example for using the fixture
+ * xorg::testing::Test for your own tests. Please
+ * make sure that you have the X.org dummy display
+ * driver installed on your system and that you execute
+ * the test with root privileges.
+ */
+TEST_F(Test, DummyXorgServerTest) {
+
+ EXPECT_NE((Window)None, DefaultRootWindow(Display()));
+
+}
diff --git a/examples/xorg-gtest-example.cpp b/examples/xorg-gtest-example.cpp
deleted file mode 100644
index 4e9b6bb..0000000
--- a/examples/xorg-gtest-example.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <xorg/gtest/xorg-gtest.h>
-
-using namespace xorg::testing;
-
-/**
- * @example xorg-gtest-example.cpp
- *
- * This is an example for using the fixture
- * xorg::testing::Test for your own tests. Please
- * make sure that you have the X.org dummy display
- * driver installed on your system and that you execute
- * the test with root privileges.
- */
-TEST_F(Test, DummyXorgServerTest) {
-
- EXPECT_NE((Window)None, DefaultRootWindow(Display()));
-
-}
diff --git a/include/xorg/gtest/xorg-gtest-xserver.h
b/include/xorg/gtest/xorg-gtest-xserver.h
index 0574901..4d3779c 100644
--- a/include/xorg/gtest/xorg-gtest-xserver.h
+++ b/include/xorg/gtest/xorg-gtest-xserver.h
@@ -201,7 +201,7 @@ class XServer : public xorg::testing::Process {
* @param [in] key Commandline option
* @param [in] value Option value (if any)
*/
- void SetOption(const std::string &key, const std::string &value);
+ void SetOption(const std::string &key, const std::string &value = "");
/**
* Wait for a specific device to be added to the server.
--
1.7.11.7
_______________________________________________
[email protected]: X.Org development
Archives: http://lists.x.org/archives/xorg-devel
Info: http://lists.x.org/mailman/listinfo/xorg-devel
