ChangeLog | 553 ++++++++++++ debian/changelog | 9 debian/control | 3 debian/docs | 1 debian/libxorg-gtest0.symbols | 43 debian/patches/0001-Fix-linking-against-X-server-libs.patch | 29 debian/patches/series | 2 debian/rules | 2 debian/watch | 2 include/xorg/gtest/environment.h | 85 + src/Makefile.am | 14 src/defines.h | 2 src/environment.cpp | 48 - src/libxorg-gtest.ver | 15 src/libxorg-gtest_main.ver | 7 src/main.cpp | 37 16 files changed, 793 insertions(+), 59 deletions(-)
New commits: commit 88db81ac59f3419c77e38fee22d045152fc23e73 Author: Chase Douglas <[email protected]> Date: Wed Feb 15 08:59:20 2012 -0800 Apply quilt patches before running autoreconf diff --git a/debian/rules b/debian/rules index 966aba7..019d49a 100755 --- a/debian/rules +++ b/debian/rules @@ -4,7 +4,7 @@ #export DH_VERBOSE=1 %: - dh $@ --parallel --with autoreconf,quilt + dh $@ --parallel --with quilt,autoreconf override_dh_auto_build: dh_auto_build -- all doc commit 43a562180eb0a2cac3b158b9e1189e2d06b35315 Author: Chase Douglas <[email protected]> Date: Wed Feb 15 08:56:02 2012 -0800 Fix linking against X server libs * Fix linking against X server libs - Added 0001-Fix-linking-against-X-server-libs.patch diff --git a/debian/changelog b/debian/changelog index 39e8c0d..5076499 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,10 @@ xorg-gtest (0.1.0-1) UNRELEASED; urgency=low + [ Daniel d'Andrada ] * Initial release - -- Daniel d'Andrada <[email protected]> Thu, 02 Feb 2012 10:51:02 -0200 + [ Chase Douglas ] + * Fix linking against X server libs + - Added 0001-Fix-linking-against-X-server-libs.patch + + -- Chase Douglas <[email protected]> Wed, 15 Feb 2012 08:55:27 -0800 diff --git a/debian/patches/0001-Fix-linking-against-X-server-libs.patch b/debian/patches/0001-Fix-linking-against-X-server-libs.patch new file mode 100644 index 0000000..dd25e5d --- /dev/null +++ b/debian/patches/0001-Fix-linking-against-X-server-libs.patch @@ -0,0 +1,29 @@ +From fc02e9aa96646c0ea60384b14083107a10e965b2 Mon Sep 17 00:00:00 2001 +From: Chase Douglas <[email protected]> +Date: Wed, 15 Feb 2012 08:54:08 -0800 +Subject: [PATCH] Fix linking against X server libs + +Signed-off-by: Chase Douglas <[email protected]> +--- + src/Makefile.am | 4 ++-- + 1 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 579ed9c..c266421 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -26,9 +26,9 @@ libxorg_gtest_main_la_CPPFLAGS = \ + $(AM_CPPFLAGS) \ + $(GTEST_CPPFLAGS) + +-libxorg_gtest_la_LDFLAGS = $(X11_LIBS) -Wl,--version-script=libxorg-gtest.ver ++libxorg_gtest_la_LDFLAGS = $(XSERVER_LIBS) -Wl,--version-script=libxorg-gtest.ver + libxorg_gtest_main_la_LDFLAGS = \ +- $(X11_LIBS) \ ++ $(XSERVER_LIBS) \ + -Wl,--version-script=libxorg-gtest_main.ver + + AM_CXXFLAGS = -I$(top_srcdir)/include +-- +1.7.9 + diff --git a/debian/patches/series b/debian/patches/series index 7ff4209..cb3ee71 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1 +1 @@ -# No patches yet +0001-Fix-linking-against-X-server-libs.patch commit dd64957252c82a9ac8f6351c359599f088052834 Author: Chase Douglas <[email protected]> Date: Wed Feb 15 07:59:13 2012 -0800 Don't ship changelog derived from upstream diff --git a/debian/docs b/debian/docs index fc82724..e845566 100644 --- a/debian/docs +++ b/debian/docs @@ -1,2 +1 @@ README -ChangeLog commit 1cec972b731d6131f2f5cd958f38c50914f2df19 Author: Chase Douglas <[email protected]> Date: Wed Feb 15 07:45:07 2012 -0800 Bump changelogs. diff --git a/ChangeLog b/ChangeLog index e69de29..5f7be9e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -0,0 +1,553 @@ +commit 1f4bd9c267e70cf9ac8a57f90bf1795b0fa63d6c +Author: Chase Douglas <[email protected]> +Date: Sat Feb 4 11:47:35 2012 -0800 + + Add symbol version scripts + + It would be nice to explicitly list each class method, but there's no + documentation on how to do it, and everything I try fails. At least this + ensures we don't ship visible symbols that are really part of GTest. + + Signed-off-by: Chase Douglas <[email protected]> + Reviewed-by: Stephen Webb <[email protected]> + +commit 4216fddec31fed8b141f6d6f233c31e73e651fde +Author: Daniel d'Andrada <[email protected]> +Date: Mon Feb 6 09:29:46 2012 -0200 + + Make Environment API property-based. + + Instead of shoving all parameters in the constructor. + + Signed-off-by: Daniel d'Andrada <[email protected]> + Reviewed-by: Chase Douglas <[email protected]> + Signed-off-by: Chase Douglas <[email protected]> + +commit d568a6c0626eeef038753f207f234037bbbb26e4 +Author: Chase Douglas <[email protected]> +Date: Fri Feb 3 17:21:22 2012 -0800 + + Ship conf files + + Signed-off-by: Chase Douglas <[email protected]> + +commit 50cd80649cd09800a245754bb7621de777026022 +Author: Chase Douglas <[email protected]> +Date: Fri Feb 3 17:20:10 2012 -0800 + + Add defines.h to the list of source files + + This ensures the header is shipped in the dist tarball. + + Signed-off-by: Chase Douglas <[email protected]> + +commit 24fbaa20c179ce4b4d9be9627bb41daffc91527a +Author: Jussi Pakkanen <[email protected]> +Date: Thu Feb 2 14:36:32 2012 +0200 + + Fix build system. + + The project could not be built from scratch due to erroneous + Autofoo setup. This commit makes it work. + + Signed-off-by: Jussi Pakkanen <[email protected]> + Reviewed-by: Chase Douglas <[email protected]> + Signed-off-by: Chase Douglas <[email protected]> + +commit 79b2d4e7f976621705bd32a9fd16e56c989a5a45 +Author: Chase Douglas <[email protected]> +Date: Wed Feb 1 11:12:29 2012 -0800 + + And by default point to a location that doesn't require root privileges to be used. + + This will make it possible to run Xorg without being root. + + Signed-off-by: Daniel d'Andrada <[email protected]> + +commit 656d8b22be42b23d5336a85173d7381bf115a327 +Merge: 37906b3 e5f21a6 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 21 08:30:43 2011 -0800 + + Merge some miscellaneous fixes + +commit e5f21a67393a5db4d91f07f87a649ec38d27fcc7 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 21 08:09:22 2011 -0800 + + Use "make doc" to build all documentation + + And clean up doc/Makefile.am targets. + +commit 739e52c343cdd412c0c4e9e21dd79be25b3027ca +Author: Chase Douglas <[email protected]> +Date: Wed Dec 21 07:51:51 2011 -0800 + + Rename xorg_gtest_example to xorg-gtest-example + +commit c63e0369cc4c7db7ffe3109b6ea8ff478ac4ba91 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 21 07:51:10 2011 -0800 + + Install man pages too + +commit c276dc0ac292d54ffc00dcab83ce7cc056c6c3df +Author: Chase Douglas <[email protected]> +Date: Wed Dec 21 07:49:58 2011 -0800 + + Start the so library version at 0.0.0 + +commit 37906b3c6431e470a07bbf5fd26784f5116b141c +Merge: 67c98e9 5f10cf0 +Author: Thomas Voß <[email protected]> +Date: Fri Dec 16 11:44:34 2011 +0100 + + Merged in lp:~chasedouglas/xorg-gtest/fixes. + +commit 67c98e96ab8ee10e2d399d1ed4fd1f20e3daffd5 +Merge: 286707f be95cf5 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 11:59:40 2011 -0800 + + Merge example documentation fixes + +commit 5f10cf0d7bc2492e53bba8dc2105c8a9b8445a18 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 11:34:01 2011 -0800 + + Fix gtest cpp flags + +commit c8a4e665b558f2e39b63bfe91a7081fc041887c2 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 11:18:49 2011 -0800 + + Use gtest lib path when checking for gtest library + +commit 5bbdf9fe259a3bde28192286de2a685457b49a50 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 11:11:25 2011 -0800 + + Use Process::SetEnv() in Environment::SetUp() + +commit 327d46a503ab1f57134e9d3a56f6792b151e8c03 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 11:10:59 2011 -0800 + + Make Process::GetEnv and SetEnv static methods + + They do not modify or use a Process object. They are merely helper + functions. + +commit 8b2947df181dba16e07bd399d33ef0ae60aebdeb +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 11:01:39 2011 -0800 + + Move SetUp and TearDown methods to protected sections + +commit 7b18bcffa98443e736dbfde2848698f5e6d6efa9 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 11:00:13 2011 -0800 + + Don't install Doxyfile + +commit e51bcee92edeb7f3da577f9f2da2b6ecb96d17d4 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 10:54:33 2011 -0800 + + Only install documentation if it was created + +commit d5df40d00c6729dfdf1504d50f3658d3de22c5f5 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 10:38:44 2011 -0800 + + Remove leftover geistest doc line in doc/Makefile.am + +commit 286707f7a39ce7daa753994f35776ff2f273f07e +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 10:29:22 2011 -0800 + + Don't link gtest when creating library + +commit be95cf5f4fccaf6393ac65f3c3f9254acfd8ee17 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 09:27:07 2011 -0800 + + Include examples directory when scanning for documented sources + +commit 42d3e9d818d4827ae001c50dd190fd477ffce593 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 09:21:30 2011 -0800 + + Remove license header from example + + It clutters up the example and is unnecessary for such a small file. + +commit 6f0204791b3057ad49719675f30810c1b2755aff +Merge: bb34e85 2e13892 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 09:13:34 2011 -0800 + + Merge in Doxygen branch, which also includes many fixes + +commit bb34e8586f1d74e4717dc8300bea6628b9a38804 +Merge: 4ee62b3 5b07f09 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 14 08:25:54 2011 -0800 + + Merge gtest configure check fixes + +commit 2e13892e9031e10dc91a2677295be654eb6b7747 +Author: Thomas Voß <[email protected]> +Date: Wed Dec 14 16:19:03 2011 +0100 + + Introduced examples. Added virtual d'tors to xorg::testing::Environment and xorg::testing::Test. + +commit 5b07f09f0713b670070e4d44ada2aeab3f6e883c +Author: Chase Douglas <[email protected]> +Date: Tue Dec 13 17:30:48 2011 -0800 + + Use AC_LANG_PUSH(C++)/AC_LANG_POP so as not to contaminate configure.ac + +commit 9a493fa6cbaa61582092b2484ab2cf95edcc8dcf +Author: Chase Douglas <[email protected]> +Date: Tue Dec 13 17:21:24 2011 -0800 + + Link against pthread when checking for gtest library + +commit 9b93e8df1f350fd1fc3cd0888c0bf565bf3e18f0 +Author: Chase Douglas <[email protected]> +Date: Tue Dec 13 17:02:48 2011 -0800 + + Move check result test to configure.ac and use standard variables + +commit 41d0b41fc5b244438af787de687a4b341889cadc +Author: Chase Douglas <[email protected]> +Date: Tue Dec 13 16:49:08 2011 -0800 + + Remove unnecessary HAVE_GTEST conditional in configure.ac + +commit 0ada1132294813196503527124d321093cb36e7f +Author: Chase Douglas <[email protected]> +Date: Tue Dec 13 16:48:37 2011 -0800 + + Make gtest a requirement for successful configuration + + And switch to the non-deprecated AC_CHECK_LIB. + +commit 69569cba1db0c17ae04d5c26c62fd02fa6473191 +Author: Thomas Voß <[email protected]> +Date: Tue Dec 13 18:33:39 2011 +0100 + + Adjusted signature of Process::GetEnv. Adjusted documentation. + +commit 78ac5be868fd1e1d31300a61f8e425736c586b58 +Author: Thomas Voß <[email protected]> +Date: Tue Dec 13 10:15:24 2011 +0100 + + Fixed typo in test.h. + +commit 8ace60ed7cc70589de26ec3e5e409588a0f0bd00 +Author: Thomas Voß <[email protected]> +Date: Tue Dec 13 10:08:09 2011 +0100 + + Modified Process::Terminate and Process::Kill to reset process identifier. Adjusted documentation. + +commit 932bf1ec03ed9160c9784fdbb7f3a9456a5beb50 +Author: Thomas Voß <[email protected]> +Date: Tue Dec 13 10:00:07 2011 +0100 + + Adjusted documentation according to review. Switched to std::string for environment query/adjustment in Process. + +commit 07ffdc1266c3c3d7c5d2df56666567777fd54050 +Author: Thomas Voß <[email protected]> +Date: Tue Dec 13 07:37:37 2011 +0100 + + Prevent from linking Test in Google Test. Set HIDE_SCOPE_NAMES to NO. + +commit 4ee62b348d2346e03b6cbbfd94f710eda499d011 +Merge: bd17c14 934da76 +Author: Chase Douglas <[email protected]> +Date: Mon Dec 12 11:28:13 2011 -0800 + + Merge cleanup and fixes branch + +commit bb43c8271894e29a5818fadacde9bb459a55e6e1 +Author: Thomas Voß <[email protected]> +Date: Mon Dec 12 09:44:51 2011 +0100 + + Referenced manpage of execvp in documentation. + +commit 6383f42858833f9695580f365352df30f4e33fb2 +Author: Thomas Voß <[email protected]> +Date: Mon Dec 12 09:31:21 2011 +0100 + + Fixed whitespace issue. + +commit e7ea9a0717b58af7aaf9728862df424c84e58b77 +Merge: f815612 934da76 +Author: Thomas Voß <[email protected]> +Date: Mon Dec 12 09:22:17 2011 +0100 + + Added: Additional doxygen documentation and adjusted build setup to include docs. + +commit 934da7636d0cc811600c2dd73c6cd386f0851e25 +Author: Chase Douglas <[email protected]> +Date: Fri Dec 9 13:03:46 2011 -0800 + + Throw runtime_error if Test::SetUp fails to open connection to server + + gtest treats exceptions as test failures, so this should have the same + result but is a cleaner implementation. + +commit c0b553ebe1be0bf4c2ebffc1582a0e07f40aaa5a +Author: Chase Douglas <[email protected]> +Date: Fri Dec 9 12:09:28 2011 -0800 + + Add initializer for Environment::Private struct since it is not a POD + +commit f815612acc574081880c62b64ba803f5305b8bc5 +Author: Thomas Voß <[email protected]> +Date: Fri Dec 9 09:58:35 2011 +0100 + + Added doxygen documentation for public interface classes. + +commit ef3e43e4edba9577097430bed545ad4c7dca3fb8 +Author: Chase Douglas <[email protected]> +Date: Thu Dec 8 15:07:53 2011 -0800 + + Remove strdup from argument parsing in Process::Start() + + The data pointed to by the args should still be valid. There's no real + need to copy the data. + +commit 330dfc09ecc78cfd91a93ed5d41f31f0341e81a1 +Author: Chase Douglas <[email protected]> +Date: Thu Dec 8 15:00:25 2011 -0800 + + Use std::vector to store process arguments passed to execvp + +commit 3eda6c1380ab4bdfaf891d6d20097dc83dac8e65 +Author: Chase Douglas <[email protected]> +Date: Thu Dec 8 14:20:53 2011 -0800 + + Use std::auto_ptr for Test pimpl too + +commit 826c9bbf23fd5650cd2ca0e3314e4e8559b1061e +Author: Chase Douglas <[email protected]> +Date: Thu Dec 8 14:09:23 2011 -0800 + + Use C++ headers, such as cstring, instead of C-compatibility headers + +commit 1bc40ffa16a3986d901bf602fcf17504afdf6cfc +Author: Chase Douglas <[email protected]> +Date: Thu Dec 8 14:02:26 2011 -0800 + + Remove obsolete Process::SetEnvBehavior enum + +commit 6757be79645ba5a4e582e010934d1ef908896e9d +Author: Chase Douglas <[email protected]> +Date: Thu Dec 8 13:59:34 2011 -0800 + + Use std::auto_ptr for pimpls + +commit 3ddfc3d8b1dd8a99126faa2eb05687eb08c279fb +Author: Chase Douglas <[email protected]> +Date: Thu Dec 8 13:51:17 2011 -0800 + + Add newlines to end of Environment::TearDown() error messages + +commit ad2cdf9b4daf3193dc852342153719817c8b1fc0 +Author: Chase Douglas <[email protected]> +Date: Thu Dec 8 13:50:11 2011 -0800 + + In Environment::SetUp, pass std::string into Process::Start + +commit dc354884d529bf6060a6a1537339527ad70d80a7 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 15:34:30 2011 -0800 + + Fix a couple usages of C++ line comments + + C++ line comments are only used for documenting end of namespace scopes + and #endif macros. + +commit 016ff9329130266f10edd7f4828bf22e59a8c97f +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 14:46:28 2011 -0800 + + Add xorg::testing::Test base test fixture + +commit 3aea1bbbbb7f7ab8a76cdbfc110fa9c5ed14ae25 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 12:38:04 2011 -0800 + + Add server executable path option so one can test different servers + + Also, fix issues with the main option parsing code. + +commit 4f083dd6a3ea2473913d23aecf4d06f664f95bce +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 12:40:30 2011 -0800 + + Reorder Process copy constructor declarations + +commit 8fe2c7c8bfc167c577674273f462f2d7c7a1a9fa +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 12:27:12 2011 -0800 + + Fix comment in environment.h + +commit 3d4a10a0280ed3320ed221e33595623af8d20150 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 12:26:25 2011 -0800 + + Cleanup unnecessary braces in if .. else blocks in Environment::SetUp() + +commit 4348b83156925eee6f2cbdca24a2473ebfd90c9f +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 12:24:59 2011 -0800 + + Don't fail the tests if the X server refuses to die + +commit e97811a1be63c97706fe3ca87a0568eb5a585a08 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 12:15:08 2011 -0800 + + Let setenv() and getenv() do error handling, and throw exception if they + fail + +commit bd446fb14847d6ab4d6531fb39309eea58aac4df +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 12:09:04 2011 -0800 + + Throw exception if child process tries to kill itself + +commit f052b71de4ab05158b2b239d9d31d64e0aad76a4 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 12:05:26 2011 -0800 + + Remove Process::Wait() + + There are many ways to wait on the status of a process. We don't want to + get into wrapping all of them. Let the caller pick and choose from the + c library. + +commit 723704879e551b971e1e3504be7338e371d4981d +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 12:02:05 2011 -0800 + + Rename Process::pid() to Process::Pid() to follow naming conventions + +commit 2a3c526f6f6d1e32a4f51bef557a26520fe01ef7 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 11:58:20 2011 -0800 + + Fix Process::Start() and switch to using exceptions + +commit 737e0bc858cb741407c24fc8597bd98f3c15a271 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 09:01:57 2011 -0800 + + Switch Process::Private to a POD struct + + Some other syntax cleanups too. + +commit c182eb93570139e18f8eeb3144e9ed5ccf3a3252 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 08:50:50 2011 -0800 + + Re-enable X server startup timeout + +commit eba6481ae557d05da0b151087a090d00496d1aa2 +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 08:50:06 2011 -0800 + + Remove dead code in Environment + +commit 204cfd5c09eb1b40059d49b9864ee0f584630a4c +Author: Chase Douglas <[email protected]> +Date: Wed Dec 7 08:47:56 2011 -0800 + + Make Environment::Private a POD struct + +commit 9c003eb98bc41d196847ab911d9d155c5a7972a4 +Author: Thomas Voß <[email protected]> +Date: Wed Dec 7 15:34:53 2011 +0100 + + ADDED: Simple and lightweight class to abstract process handling. + +commit bd17c146ff4a159393ec37f1300c613d40921bbf +Merge: 1ff7a96 7777cbb +Author: Thomas Voß <[email protected]> +Date: Tue Dec 6 11:16:25 2011 +0100 + + Merged. + +commit 7777cbbbd16d428d68fc738a946816edcb718654 +Author: Chase Douglas <[email protected]> +Date: Mon Dec 5 16:25:36 2011 -0800 + + Use installed dummy.conf location + + Also, set the location in the pkg-config file so other packages can find + it. + +commit ad0ef22400f1b9960e15e0f6fe39b3e95701f21e +Author: Chase Douglas <[email protected]> +Date: Mon Dec 5 16:02:22 2011 -0800 + + Rename testing::xorg to xorg::testing + + Prevents a possible collision with gtest's testing namespace + +commit e10564038f99adee0a12cb028cac5bd1610d7b40 +Author: Chase Douglas <[email protected]> +Date: Mon Dec 5 11:32:36 2011 -0800 + + Remove unused fixture.h + +commit 4a1d0ed99f929b658e726f83e4ded4cc5e21aabc +Author: Chase Douglas <[email protected]> +Date: Mon Dec 5 11:32:04 2011 -0800 + + Add pkg-config file + +commit 9fc1496d5a10266337773daff2b3d9937fbf8cf1 +Author: Chase Douglas <[email protected]> +Date: Mon Dec 5 10:54:49 2011 -0800 + + Remove unused gcov support + +commit e1d5b252f4c09ee52380a7b7b7533a9b7c382975 +Author: Chase Douglas <[email protected]> +Date: Mon Dec 5 10:53:37 2011 -0800 + + Remove autoconf check for C compiler since we only use C++ + +commit f4706dc1c47eb59bda619dc105a0e6e9f0a81a21 +Author: Chase Douglas <[email protected]> +Date: Mon Dec 5 10:49:52 2011 -0800 + + Init gtest before checking for special args so --help works properly + + Otherwise, it's impossible to list the gtest help list. + +commit 26cdf7ae0eb8477b2c8afa97d3857d8810de3d99 +Author: Chase Douglas <[email protected]> +Date: Mon Dec 5 10:47:31 2011 -0800 + + Remove unnecessary c++0x std flag + + We can add it back in if we actually use any of its features. + +commit d401f679f3e9161bbb06ce33bf48678c74329cd0 +Author: Chase Douglas <[email protected]> +Date: Mon Dec 5 10:46:07 2011 -0800 + + Rename to xorg-gtest, move some files around, make some fixes + +commit 1ff7a967e0648d6f71bf3bc30e3642431765da7e +Author: Thomas Voß <[email protected]> +Date: Mon Dec 5 17:27:29 2011 +0100 + + init checkin. diff --git a/debian/changelog b/debian/changelog index f3dd751..39e8c0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -xorg-gtest (0.1.0+git5b26608-1) UNRELEASED; urgency=low +xorg-gtest (0.1.0-1) UNRELEASED; urgency=low * Initial release commit a90f7120dbe3c000d0e752c717c699be11c4d311 Author: Daniel d'Andrada <[email protected]> Date: Wed Feb 15 09:15:55 2012 -0200 Adding symbols file diff --git a/debian/libxorg-gtest0.symbols b/debian/libxorg-gtest0.symbols new file mode 100644 index 0000000..024ff71 --- /dev/null +++ b/debian/libxorg-gtest0.symbols @@ -0,0 +1,43 @@ +libxorg-gtest.so.0 libxorg-gtest0 #MINVER# + XORG_GTEST_1.0@XORG_GTEST_1.0 0.1.0 + (c++)"xorg::testing::Environment::set_server(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::set_display(int)@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::set_log_file(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::set_conf_file(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::SetUp()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::TearDown()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::Environment()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::Environment()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::~Environment()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::~Environment()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::~Environment()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Test::SetUp()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Test::TearDown()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Test::Test()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Test::Test()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Test::~Test()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Test::~Test()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Test::~Test()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Process::Kill()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Process::Start(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, __va_list_tag*)@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Process::Start(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, ...)@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Process::GetEnv(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool*)@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Process::SetEnv(std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, std::basic_string<char, std::char_traits<char>, std::allocator<char> > const&, bool)@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Process::Terminate()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Process::Process()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Process::Process()@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::server() const@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::display() const@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::log_file() const@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Environment::conf_file() const@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Test::Display() const@XORG_GTEST_1.0" 0.1.0 + (c++)"xorg::testing::Process::Pid() const@XORG_GTEST_1.0" 0.1.0 + (c++)"typeinfo for xorg::testing::Environment@XORG_GTEST_1.0" 0.1.0 + (c++)"typeinfo for xorg::testing::Test@XORG_GTEST_1.0" 0.1.0 + (c++)"typeinfo name for xorg::testing::Environment@XORG_GTEST_1.0" 0.1.0 + (c++)"typeinfo name for xorg::testing::Test@XORG_GTEST_1.0" 0.1.0 + (c++)"vtable for xorg::testing::Environment@XORG_GTEST_1.0" 0.1.0 + (c++)"vtable for xorg::testing::Test@XORG_GTEST_1.0" 0.1.0 +libxorg-gtest_main.so.0 libxorg-gtest0 #MINVER# + XORG_GTEST_1.0@XORG_GTEST_1.0 0.1.0 + main@XORG_GTEST_1.0 0.1.0 commit 44afa07301de02ff4d068347cabaf6aa13c04128 Author: Daniel d'Andrada <[email protected]> Date: Wed Feb 15 07:28:23 2012 -0800 Adding debian/watch file diff --git a/debian/watch b/debian/watch new file mode 100644 index 0000000..b798019 --- /dev/null +++ b/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://xorg.freedesktop.org/archive/individual/test/xorg-gtest-(.+).tar.gz commit 1f4bd9c267e70cf9ac8a57f90bf1795b0fa63d6c Author: Chase Douglas <[email protected]> Date: Sat Feb 4 11:47:35 2012 -0800 Add symbol version scripts It would be nice to explicitly list each class method, but there's no documentation on how to do it, and everything I try fails. At least this ensures we don't ship visible symbols that are really part of GTest. Signed-off-by: Chase Douglas <[email protected]> Reviewed-by: Stephen Webb <[email protected]> diff --git a/src/Makefile.am b/src/Makefile.am index 1daeeb8..579ed9c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -26,7 +26,11 @@ libxorg_gtest_main_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ $(GTEST_CPPFLAGS) -libxorg_gtest_la_LDFLAGS = $(X11_LIBS) -libxorg_gtest_main_la_LDFLAGS = $(X11_LIBS) +libxorg_gtest_la_LDFLAGS = $(X11_LIBS) -Wl,--version-script=libxorg-gtest.ver +libxorg_gtest_main_la_LDFLAGS = \ + $(X11_LIBS) \ + -Wl,--version-script=libxorg-gtest_main.ver AM_CXXFLAGS = -I$(top_srcdir)/include + +EXTRA_DIST = libxorg-gtest.ver libxorg-gtest_main.ver diff --git a/src/libxorg-gtest.ver b/src/libxorg-gtest.ver new file mode 100644 index 0000000..e66c83a --- /dev/null +++ b/src/libxorg-gtest.ver @@ -0,0 +1,15 @@ +XORG_GTEST_1.0 { + global: + extern "C++" { + xorg::testing::*; + "typeinfo for xorg::testing::Environment"; + "typeinfo for xorg::testing::Test"; + "typeinfo name for xorg::testing::Environment"; + "typeinfo name for xorg::testing::Test"; + "vtable for xorg::testing::Environment"; + "vtable for xorg::testing::Test"; + }; + + local: + *; +}; diff --git a/src/libxorg-gtest_main.ver b/src/libxorg-gtest_main.ver new file mode 100644 index 0000000..001ce91 --- /dev/null +++ b/src/libxorg-gtest_main.ver @@ -0,0 +1,7 @@ +XORG_GTEST_1.0 { + global: + main; + + local: + *; +}; commit 4216fddec31fed8b141f6d6f233c31e73e651fde Author: Daniel d'Andrada <[email protected]> Date: Mon Feb 6 09:29:46 2012 -0200 Make Environment API property-based. Instead of shoving all parameters in the constructor. Signed-off-by: Daniel d'Andrada <[email protected]> Reviewed-by: Chase Douglas <[email protected]> Signed-off-by: Chase Douglas <[email protected]> diff --git a/include/xorg/gtest/environment.h b/include/xorg/gtest/environment.h index 3996507..843c451 100644 --- a/include/xorg/gtest/environment.h +++ b/include/xorg/gtest/environment.h @@ -47,16 +47,11 @@ namespace testing { * Either associate the environment manually * with the overall testing framework like * @code - * std::string xorg_conf_path("conf/dummy.conf"); - * std::string xorg_log_file_path("/tmp/MyDummyXorg.log"); - * int xorg_display = 133; - * std::string server("Xorg"); - * - * xorg::testing::Environment* environment = new xorg::testing::Environment( - * xorg_conf_path, - * server, - * xorg_display); - * environment->set_log_file(xorg_log_file_path); + * xorg::testing::Environment* environment = new xorg::testing::Environment; + * environment->set_server("Xorg"); + * environment->set_display(133); + * environment->set_conf_file("conf/dummy.conf"); + * environment->set_log_file("/tmp/MyDummyXorg.log"); * testing::AddGlobalTestEnvironment(environment); * @endcode * or link to libxorg-gtest_main. @@ -65,28 +60,78 @@ class Environment : public ::testing::Environment { public: /** * Constructs an object to provide a global X server dummy environment. - * @param path_to_conf Path to xserver configuration. - * @param path_to_server Path to xserver executable. - * @param display Display port of dummy xserver instance. */ - Environment(const std::string& path_to_conf, - const std::string& path_to_server = "Xorg", int display = 133); + Environment(); virtual ~Environment(); /** - * Sets the path where the xserver log file will be created. - * @param path_to_log_file Path to xserver logfile. + * Sets the path where the server log file will be created. + * + * The path will be passed on to the server via the command line argument + * "-logfile". The default value is "/tmp/Xorg.GTest.log". + * + * @param path_to_log_file Path to server logfile. */ void set_log_file(const std::string& path_to_log_file); /** - * Returns the path where the xserver log file will be created. - * Its default value is "/tmp/Xorg.GTest.log" - * @return Path to xserver logfile. + * Returns the path where the server log file will be created. + * + * @return Path to server logfile. */ const std::string& log_file() const; + /** + * Sets the path to the desired server configuration file. + * + * The path will be passed on to the server via the command line argument + * "-config". The default value is "[datadir]/xorg/gtest/dummy.conf". + * + * @param path_conf_file Path to a Xorg X server .conf file. + */ + void set_conf_file(const std::string& path_conf_file); + + /** + * Returns the path of the server configuration file to be used. + * + * @return File path of the server configuration currently set + */ + const std::string& conf_file() const; + + /** + * Sets the path to the server executable + * + * The default value is "Xorg". + * + * @param path_to_server Path to an X.org server executable + */ + void set_server(const std::string& path_to_server); + + /** + * Returns the path of the server executable to be used. + * + * @return Path to server executable. + */ + const std::string& server() const; + + /** + * Sets the display number that the server will use. + * + * The display number will be passed on to the server via the command line. + * The default value is 133. + * + * @param diplay_num A display number. + */ + void set_display(int display_num); + + /** + * Returns the display number of the server instance. + * + * @return Display number of the server. + */ + int display() const; + protected: /** * Starts the dummy X server. diff --git a/src/Makefile.am b/src/Makefile.am index d1b5995..1daeeb8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -7,7 +7,8 @@ libxorg_gtest_la_SOURCES = \ libxorg_gtest_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ - $(GTEST_CPPFLAGS) + $(GTEST_CPPFLAGS) \ + -DDUMMY_CONF_PATH="\"$(library_datadir)/dummy.conf\"" libxorg_gtest_main_la_SOURCES = \ defines.h \ @@ -23,8 +24,7 @@ library_data_DATA = $(top_srcdir)/conf/dummy.conf libxorg_gtest_main_la_CPPFLAGS = \ $(AM_CPPFLAGS) \ - $(GTEST_CPPFLAGS) \ - -DDUMMY_CONF_PATH="\"$(library_datadir)/dummy.conf\"" + $(GTEST_CPPFLAGS) libxorg_gtest_la_LDFLAGS = $(X11_LIBS) libxorg_gtest_main_la_LDFLAGS = $(X11_LIBS) diff --git a/src/defines.h b/src/defines.h index 6b5bcac..3bfc1da 100644 --- a/src/defines.h +++ b/src/defines.h @@ -2,5 +2,7 @@ #define XORGGTEST_DEFINES #define DEFAULT_XORG_LOGFILE "/tmp/Xorg.GTest.log" +#define DEFAULT_XORG_SERVER "Xorg" +#define DEFAULT_DISPLAY 133 #endif diff --git a/src/environment.cpp b/src/environment.cpp index a888454..10db3c7 100644 --- a/src/environment.cpp +++ b/src/environment.cpp -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected] Archive: http://lists.debian.org/[email protected]
