[PATCH xorg-gtest 1/8] Move xorg-gtest.cpp to xorg-gtest-example.cpp

Chase Douglas chase.douglas at canonical.com
Fri Mar 9 12:45:30 PST 2012


This makes the source file match the built executable.

Signed-off-by: Chase Douglas <chase.douglas at canonical.com>
---
 examples/Makefile.am            |    2 +-
 examples/xorg-gtest-example.cpp |   18 ++++++++++++++++++
 examples/xorg-gtest.cpp         |   18 ------------------
 3 files changed, 19 insertions(+), 19 deletions(-)
 create mode 100644 examples/xorg-gtest-example.cpp
 delete mode 100644 examples/xorg-gtest.cpp

diff --git a/examples/Makefile.am b/examples/Makefile.am
index e8f8713..fcaca2b 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -26,7 +26,7 @@
 
 noinst_PROGRAMS = xorg-gtest-example
 
-xorg_gtest_example_SOURCES = xorg-gtest.cpp
+xorg_gtest_example_SOURCES = xorg-gtest-example.cpp
 
 AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CXXFLAGS = $(XSERVER_CFLAGS) $(GTEST_CPPFLAGS) $(BASE_CXXFLAGS)
diff --git a/examples/xorg-gtest-example.cpp b/examples/xorg-gtest-example.cpp
new file mode 100644
index 0000000..529fdda
--- /dev/null
+++ b/examples/xorg-gtest-example.cpp
@@ -0,0 +1,18 @@
+#include <xorg/gtest/test.h>
+
+using namespace xorg::testing;
+
+/**
+ * @example xorg-gtest.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(0, DefaultRootWindow(Display()));
+
+}
diff --git a/examples/xorg-gtest.cpp b/examples/xorg-gtest.cpp
deleted file mode 100644
index 529fdda..0000000
--- a/examples/xorg-gtest.cpp
+++ /dev/null
@@ -1,18 +0,0 @@
-#include <xorg/gtest/test.h>
-
-using namespace xorg::testing;
-
-/**
- * @example xorg-gtest.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(0, DefaultRootWindow(Display()));
-
-}
-- 
1.7.9



More information about the xorg-devel mailing list