diff options
| author | Chase Douglas <chase.douglas@canonical.com> | 2012-05-24 10:00:25 -0700 |
|---|---|---|
| committer | Chase Douglas <chase.douglas@canonical.com> | 2012-05-24 10:00:25 -0700 |
| commit | b6fb8681c4b56f6028f9c981cfa27f6466ff74bd (patch) | |
| tree | 21cec2f741236dbc9e824c4cd95d7658f794722e | |
| parent | d5bc8f147f25f4a5aff8011a2ea542ddd606df23 (diff) | |
| parent | 6a1174b8cdfc2079dd72209f49197d7a9c6555f1 (diff) | |
Merge branch 'master' of ssh://git.freedesktop.org/git/xorg/test/xorg-gtest
| -rw-r--r-- | examples/xorg-gtest-example.cpp | 2 | ||||
| -rw-r--r-- | src/device.cpp | 2 | ||||
| -rw-r--r-- | src/environment.cpp | 4 | ||||
| -rw-r--r-- | src/process.cpp | 2 | ||||
| -rw-r--r-- | src/test.cpp | 2 | ||||
| -rw-r--r-- | src/xorg-gtest_main.cpp | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/examples/xorg-gtest-example.cpp b/examples/xorg-gtest-example.cpp index 529fdda..6a2f662 100644 --- a/examples/xorg-gtest-example.cpp +++ b/examples/xorg-gtest-example.cpp @@ -1,4 +1,4 @@ -#include <xorg/gtest/test.h> +#include <xorg/gtest/xorg-gtest.h> using namespace xorg::testing; diff --git a/src/device.cpp b/src/device.cpp index 13d90ee..89eb8ea 100644 --- a/src/device.cpp +++ b/src/device.cpp @@ -25,7 +25,7 @@ * ******************************************************************************/ -#include "xorg/gtest/evemu/device.h" +#include "xorg/gtest/evemu/xorg-gtest_device.h" #include <fcntl.h> diff --git a/src/environment.cpp b/src/environment.cpp index d7d1c82..38765ac 100644 --- a/src/environment.cpp +++ b/src/environment.cpp @@ -25,8 +25,8 @@ * ******************************************************************************/ -#include "xorg/gtest/environment.h" -#include "xorg/gtest/process.h" +#include "xorg/gtest/xorg-gtest_environment.h" +#include "xorg/gtest/xorg-gtest_process.h" #include "defines.h" #include <sys/types.h> diff --git a/src/process.cpp b/src/process.cpp index 46d4b98..c11f12f 100644 --- a/src/process.cpp +++ b/src/process.cpp @@ -25,7 +25,7 @@ * ******************************************************************************/ -#include "xorg/gtest/process.h" +#include "xorg/gtest/xorg-gtest_process.h" #include <sys/types.h> #include <sys/wait.h> diff --git a/src/test.cpp b/src/test.cpp index 78158f9..c2df5a7 100644 --- a/src/test.cpp +++ b/src/test.cpp @@ -25,7 +25,7 @@ * ******************************************************************************/ -#include "xorg/gtest/test.h" +#include "xorg/gtest/xorg-gtest_test.h" #include <stdexcept> diff --git a/src/xorg-gtest_main.cpp b/src/xorg-gtest_main.cpp index 8953afa..bbf232b 100644 --- a/src/xorg-gtest_main.cpp +++ b/src/xorg-gtest_main.cpp @@ -31,7 +31,7 @@ #include <gtest/gtest.h> -#include "xorg/gtest/environment.h" +#include "xorg/gtest/xorg-gtest_environment.h" #include "defines.h" namespace { |