summaryrefslogtreecommitdiff
AgeCommit message (Collapse)AuthorFilesLines
2012-04-20Wait for dummy X server to shut down in Environment::TearDown()fixesChase Douglas1-6/+24
If two xorg-gtest binaries are executed one after another, the second one may attempt to start its X server before the first one's X server has fully shut down. This leads to the second X server not starting. Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-04-18Provide a full server layout in dummy.confChase Douglas1-0/+10
The X.org server uses the first server layout, and provides one if none are found. If a layout is specified in /usr/share/X11/xorg.conf.d, the dummy video device configuration may not be used. This change ensures that the dummy video device is used by providing a full server layout in the main configuration file. Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-04-18Kill dummy Xorg server when a terminating signal arrivesChase Douglas1-1/+55
This only takes effect if the program links in the provided main() function. If you provide your own main() you must handle signals yourself. Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-04-18Add Environment::Kill() to forcefully terminate the dummy Xorg serverChase Douglas2-0/+11
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-03-26Add missing Identifier name to 99-virtual-test-devices.confChase Douglas1-0/+1
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-03-23Add an xorg configuration file snippet to disable grabbing of test devices.Thomas Voß2-1/+8
When a test creates a test trackpad device, an already running X server will likely grab the event node. This causes the dummy X server to fail to instantiate the device, and ends in test failure. This will ensure that the normal X server does not attempt to grab the test device. Signed-off-by: Thomas Voß <thomas.voss@canonical.com> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-03-19Release version 0.2.0Chase Douglas1-1/+1
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-03-19Ship xorg-gtest.m4 and Makefile-xorg-gtest.amChase Douglas7-6/+272
See README for instructions on how to use them. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Christopher James Halse Rogers <christopher.halse.rogers@canonical.com>
2012-03-16Print more helpful error message when X server fails to startChase Douglas1-6/+12
Usually, xorg-gtest requires the dummy video driver. It also requires an X server at least version 1.12, or to be run as root when testing with a previous X server. Print this information when the server fails to start, and point the user to the log file for further details. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
2012-03-16Allow user to override default Xorg server binaryChase Douglas1-1/+5
This can be accomplished by compiling xorg-gtest with -DDEFAULT_XORG_SERVER=path/to/Xorg. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
2012-03-16Install, but do not build into a library, the xorg-gtest sourcesChase Douglas5-74/+14
This mimics the Google Test distribution mechanism. See: http://code.google.com/p/googletest/wiki/FAQ#Why_is_it_not_recommended_to_install_a_pre-compiled_copy_of_Goog Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
2012-03-16Build gtest as part of the projectChase Douglas3-26/+121
Google Test does not recommend using precompiled gtest libraries. See: http://code.google.com/p/googletest/wiki/FAQ#Why_is_it_not_recommended_to_install_a_pre-compiled_copy_of_Goog This change modifies the build system so the examples build the gtest and xorg-gtest libraries and link against the locally built libraries instead of any other precompiled libraries on the system. It uses the same compiler flags to compile everything so the C++ One-Definition Rule is not broken. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
2012-03-16Provide meta-source file xorg-gtest-all.cppChase Douglas2-4/+35
This will make compiling the project each time it is used much easier. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
2012-03-16Rename main.cpp to xorg-gtest_main.cppChase Douglas2-1/+1
This matches the library name and will help with understanding what the includes since we are now shipping the source code. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
2012-03-16Add a meta-header xorg-gtest.hChase Douglas3-5/+38
The header merely includes all the other headers. It will make building xorg-gtest into each project easier. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
2012-03-16Install xorg-gtest source code in $(prefix)/src/xorg-gtestChase Douglas1-0/+3
Google Test suggests that source code be built into each test rather than use a pre-compiled library. This change follows their lead and installs the xorg-gtest source code. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
2012-03-16Move xorg-gtest.cpp to xorg-gtest-example.cppChase Douglas2-1/+1
This makes the source file match the built executable. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-By: Christopher Halse Rogers <christopher.halse.rogers@canonical.com>
2012-03-09config: merge both AC_CONFIG_FILES statements.Gaetan Nadon1-4/+3
Typically all modules have a single statement unless some output files are conditionally generated. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-03-09config: remove unrequired AC_SUBST DUMMY_CONF_PATH statementGaetan Nadon1-2/+0
The variable is not used in any makefile. Configure.ac does not participate in the determination of the conf path. The final value of datadir is not known at config time, only at make time. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-03-09config: use existing feature --enable-strict-compilationGaetan Nadon2-4/+0
This replaces current code attempting to perform similar function. In configure.ac, the code is gcc specific. The src/Makefile.am has $(WARNING_FLAGS) rather than $(WARNING_CPPFLAGS) http://cgit.freedesktop.org/xorg/util/macros/tree/xorg-macros.m4.in Looking at the xorg-gtest module --help text: --enable-strict-compilation Enable all warnings from compiler and make them errors (default: disabled) Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-03-09config: support Automake 1.10Gaetan Nadon1-2/+1
X.Org has a requirement to support 1.10 or later. The silent rules are handled by XORG_DEFAULT_OPTIONS We do not write the version number, but refer to the wiki: http://www.x.org/wiki/ModularDevelopersGuide#GNU_Build_System Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-03-09config: remove redundant AC_PROG_INSTALLGaetan Nadon1-1/+0
Already included in XORG_DEFAULT_OPTIONS Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-03-07Add xorg::testing::evemu::DeviceHEADmasterChase Douglas6-1/+218
Device uses utouch-evemu for input device recording playback through the Linux kernel. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Acked-by: Peter Hutterer <peter.hutterer@who-t.net> Reviewed-by: Stephen Webb <stephen.webb@canonical.com>
2012-03-06Fix dummy.conf location definitionChase Douglas1-1/+1
Now that the xorg-gtest data build has been separated from the src build, the location definition is broken and results in xorg-gtest looking for /dummy.conf instead of ${datadir}/xorg/gtest/dummy.conf. This change fixes the location Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-03-06Add examples/xorg-gtest-example to .gitignoreChase Douglas1-0/+1
Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-03-06Define automake CPP warning flags in Makefile.am, not configure.acChase Douglas2-3/+5
Otherwise, AM_CPPFLAGS could not be overridden in Makefile.am. Also, move AM_CXXFLAGS to the top of src/Makefile.am to match. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-03-06Use BASE_CXXFLAGS from xorg macrosChase Douglas4-9/+12
The X.org macros package version 1.16.2 is the first to define BASE_CXXFLAGS; however, we don't need to require version 1.16.2. If it's available, then great. If not, $(BASE_CXXFLAGS) will be empty and nothing terrible will happen. Included in this commit is a fix for an error, now that we are using BASE_CXXFLAGS, for shadowing variables from parent contexts. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-03-06Split data and include build rules out of src build rulesChase Douglas6-11/+62
This will simplify things when we add more features to xorg-gtest. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
2012-03-01Relicense under the X.org preferred licenseChase Douglas12-799/+246
Copied from http://www.x.org/releases/X11R7.6/doc/xorg-docs/License.html Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Acked-by: Daniel Stone <daniel@fooishbar.org> Reviewed-by: Gaetan Nadon <memsize@videotron.ca>
2012-02-29config: do not initialize libtool twiceGaetan Nadon1-2/+0
AC_PROG_LIBTOOL initializes libtool, contrary to what the name may suggest. It has been renamed to LT_INIT in libtool v2. However X.Org has a requirement to support libtool v1.5. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-29config: no need to m4_include gtest.m4Gaetan Nadon1-2/+0
This is done when autoconf runs aclocal. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-29Remove xorg-server pkgconfig checkChase Douglas1-1/+1
xorg-server flags are not needed. Including them also causes -fvisibility=hidden to be used, which breaks the build output. Signed-off-by: Chase Douglas <chase.douglas@canonical.com> Reviewed-by: Gaeton Nadon <memsize@videotron.ca>
2012-02-29distcheck: cannot create directory `xorg-gtest-0.1.1': Permission deniedGaetan Nadon5-3/+9
Use the util-macros implementation to generate the ChangeLog and the INSTALL file. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2012-02-29distcheck fails: cannot open linker script file libxorg-gtest.verGaetan Nadon1-2/+2
The $(top_srcdir) path is needed to locate the source as it is not in the same dir as the generated files. Signed-off-by: Gaetan Nadon <memsize@videotron.ca> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-29Revert "Use the standard autogen.sh script from xorg"Gaetan Nadon1-2/+0
This reverts commit 839257c03d033f4352243ac70be9f78c5a8dfdd0. This module has different requirements for autogen.sh. The upcoming version with the variable NOCONFIGURE would probably be satisfactory. Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-26examples/test.cpp: fatal error: X11/Xlib.h: No such file or directoryGaetan Nadon1-4/+2
Need XSERVER_CFLAGS to locate Xlib.h Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2012-02-26test.cpp: fatal error: X11/Xlib.h: No such file or directoryGaetan Nadon1-1/+1
Need XSERVER_CFLAGS to locate Xlib.h Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2012-02-26Fix typo in .gitignore commentGaetan Nadon1-1/+1
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2012-02-26Add standard xorg toplevel .gitignoreGaetan Nadon1-0/+78
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2012-02-26Use the standard autogen.sh script from xorgGaetan Nadon1-0/+2
The one here does not work the same way. It is very confusing when these don't work the same way for all xorg modules. It can be proposed as a new version version for all xorg modules if it can be deemed to be more desirable. Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
2012-02-24Release version 0.1.1Chase Douglas1-1/+1
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-24Generate ChangeLog at make dist timeChase Douglas1-0/+5
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-24Add GPLv3 license as COPYINGChase Douglas1-0/+674
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-24Link libxorg-gtest_main against libxorg-gtestChase Douglas1-0/+2
This fixes build failures if one only links against libxorg-gtest_main but does not use any other xorg-gtest symbols. Reported-by: Stephen Webb <stephen.webb@canonical.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-15Fix linking against X server libsChase Douglas1-2/+2
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-06Add symbol version scriptsChase Douglas3-2/+28
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 <chase.douglas@canonical.com> Reviewed-by: Stephen Webb <stephen.webb@canonical.com>
2012-02-06Make Environment API property-based.Daniel d'Andrada5-51/+127
Instead of shoving all parameters in the constructor. Signed-off-by: Daniel d'Andrada <daniel.dandrada@canonical.com> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-03Ship conf filesChase Douglas1-0/+2
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-03Add defines.h to the list of source filesChase Douglas1-0/+1
This ensures the header is shipped in the dist tarball. Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
2012-02-02Fix build system.Jussi Pakkanen4-38/+38
The project could not be built from scratch due to erroneous Autofoo setup. This commit makes it work. Signed-off-by: Jussi Pakkanen <jussi.pakkanen@canonical.com> Reviewed-by: Chase Douglas <chase.douglas@canonical.com> Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-21 12:56:24 +0000