[waffle] [PATCH (master) 1/2] tests: Move all test executables to $CMAKE_BINARY_DIR/tests

Chad Versace chad.versace at linux.intel.com
Wed Aug 13 14:53:49 PDT 2014


This makes it easier to find and run test executables by hand.

Cc: Emil Velikov <emil.l.velikov at gmail.com>
Signed-off-by: Chad Versace <chad.versace at linux.intel.com>
---
 .gitignore                      | 2 +-
 tests/functional/CMakeLists.txt | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index f4a0e43..eabf007 100644
--- a/.gitignore
+++ b/.gitignore
@@ -55,7 +55,7 @@ Makefile
 /examples/simple-x11-egl
 /lib/
 /src/waffle/libwaffle_static.a
-/tests/functional/gl_basic_test
+/tests/gl_basic_test
 /tests/waffle_test/libwaffle_test.dylib
 /tests/unittests/waffle-unittest
 /tests/wcore_attrib_list_unittest
diff --git a/tests/functional/CMakeLists.txt b/tests/functional/CMakeLists.txt
index 7a83e39..d78328c 100644
--- a/tests/functional/CMakeLists.txt
+++ b/tests/functional/CMakeLists.txt
@@ -31,10 +31,13 @@ set_source_files_properties(
 add_executable(gl_basic_test
     ${gl_basic_test_sources}
     )
-
+set_target_properties(gl_basic_test
+    PROPERTIES
+        RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/tests
+    )
 add_custom_target(gl_basic_test_run
     DEPENDS gl_basic_test
-    COMMAND ${CMAKE_BINARY_DIR}/tests/functional/gl_basic_test
+    COMMAND ${CMAKE_BINARY_DIR}/tests/gl_basic_test
     )
 
 add_dependencies(check-func gl_basic_test_run)
-- 
2.0.4



More information about the waffle mailing list