diff options
| author | macslow@bangang.de <> | 2011-02-21 14:21:49 +0100 |
|---|---|---|
| committer | macslow@bangang.de <> | 2011-02-21 14:21:49 +0100 |
| commit | 47aa765636aa20ea7e99908ec36f3085cd717a42 (patch) | |
| tree | 6f465de11e97a76186d02b2301c17975908cd64a /tests | |
| parent | cfd64185053dd98546956973eb9922fc4bcfa26e (diff) | |
| parent | 75ac04af917e93386fb6b58b1cac5ebb1ed7aea3 (diff) | |
Re-merge with unity trunk again... fixed merge-conflicts
(bzr r854.3.6)
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | tests/TestPlacesGroup.cpp | 5 | ||||
| -rw-r--r-- | tests/TestPlacesResults.cpp | 5 | ||||
| -rw-r--r-- | tests/TestPlacesTiles.cpp | 5 |
4 files changed, 10 insertions, 6 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index e81eb8a28..5d5ea295c 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -14,6 +14,7 @@ pkg_check_modules (TEST_UNIT_DEPS REQUIRED ${TEST_DEPS} indicator) set (CFLAGS ${TEST_UNIT_DEPS_CFLAGS} ${TEST_UNIT_DEPS_CFLAGS_OTHER} + ${MAINTAINER_CFLAGS} "-DTESTDATADIR=${TESTDATADIR}" "-DGETTEXT_PACKAGE=\"unity\"" "-DINDICATORDIR=\"${CMAKE_BINARY_DIR}/tests\"" diff --git a/tests/TestPlacesGroup.cpp b/tests/TestPlacesGroup.cpp index abadd659c..a1965c40e 100644 --- a/tests/TestPlacesGroup.cpp +++ b/tests/TestPlacesGroup.cpp @@ -134,8 +134,9 @@ ControlThread (nux::NThread* thread, nux::SleepForMilliseconds (3000); printf ("ControlThread successfully started\n"); - nux::WindowThread* mainWindowThread = NUX_STATIC_CAST (nux::WindowThread*, - data); + nux::WindowThread* mainWindowThread; + + mainWindowThread = NUX_STATIC_CAST (nux::WindowThread*, data); } diff --git a/tests/TestPlacesResults.cpp b/tests/TestPlacesResults.cpp index 18eb2491a..f4953c138 100644 --- a/tests/TestPlacesResults.cpp +++ b/tests/TestPlacesResults.cpp @@ -135,8 +135,9 @@ ControlThread (nux::NThread* thread, nux::SleepForMilliseconds (3000); printf ("ControlThread successfully started\n"); - nux::WindowThread* mainWindowThread = NUX_STATIC_CAST (nux::WindowThread*, - data); + nux::WindowThread* mainWindowThread; + + mainWindowThread = NUX_STATIC_CAST (nux::WindowThread*, data); } diff --git a/tests/TestPlacesTiles.cpp b/tests/TestPlacesTiles.cpp index 64a627044..ab8d2f427 100644 --- a/tests/TestPlacesTiles.cpp +++ b/tests/TestPlacesTiles.cpp @@ -83,8 +83,9 @@ ControlThread (nux::NThread* thread, nux::SleepForMilliseconds (3000); printf ("ControlThread successfully started\n"); - nux::WindowThread* mainWindowThread = NUX_STATIC_CAST (nux::WindowThread*, - data); + nux::WindowThread* mainWindowThread; + + mainWindowThread = NUX_STATIC_CAST (nux::WindowThread*, data); } |