Age | Commit message (Collapse) | Author | Files | Lines |
|
|
|
The example tests suite failed to build in a headless environment because
that test suite relied on a default x.org installation. This patch does not
assume the build system has such a server and uses the dummy driver explicitly.
Signed-off-by: Stephen M. Webb <stephen.webb@canonical.com>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Need to actually use X11_CFLAGS and EVEMU_CFLAGS in CPPFLAGS, CXXFLAGS
(and presumably CFLAGS if that were relevant).
Also must search local directories before system directories for our
header files, otherwise installed versions will override local
versions which would be bad.
Signed-off-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net>
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
This example relies on the Environment class, make that more obvious. And
add more comments and test cases to show the usage.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Allows calls like server.SetOption("-noreset");
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
|
|
../gtest/include/gtest/gtest.h:18470:136: warning: comparison between signed
and unsigned integer expressions [-Wsign-compare]
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
(cherry picked from commit ef25a6b6f3f387a119ab9261f37479fe415702d4)
|
|
Drop the CHECK_GTEST macro, we can assume it's there now. We
still build the gtest bits as convenience libraries, leave the various flags
in there.
Add $includedir/xorg to pgkconfig CPPFLAGS, as we install gtest.h in
includedir/xorg/gtest/gtest.h to avoid overwriting or conflicts with a
system-installed gtest.h
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@ubuntu.com>
|
|
XSERVER implies this has to do with the server, but these are the client
libs.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
|
|
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
|
|
Introduced in e1c010f23272e61c28c73aa603b477ba6fbae875
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Keith Packard <keithp@keithp.com>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
|
|
introduced in e1c010f23272e61c28c73aa603b477ba6fbae875
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
|
|
check_PROGRAMS is only built on make check, so it's a good way of
introducing build errors until later (as we discovered in the server).
Always built the tests, running them is optional.
Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
Reviewed-by: Chase Douglas <chase.douglas@canonical.com>
Signed-off-by: Chase Douglas <chase.douglas@canonical.com>
|
|
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>
|
|
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>
|
|
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>
|
|
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>
|
|
Need XSERVER_CFLAGS to locate Xlib.h
Signed-off-by: Gaetan Nadon <memsize@videotron.ca>
|
|
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>
|
|
|
|
|
|
|
|
It clutters up the example and is unnecessary for such a small file.
|
|
xorg::testing::Test.
|