Eo: Properly handle tests and their deps in the build system.

SVN revision: 73533
12 years ago · 5e68a8aa43
parent d19b940099
commit 5e68a8aa43
9 changed files with 17 additions and 19 deletions
--- a/legacy/eobj/CMakeLists.txt
+++ b/legacy/eobj/CMakeLists.txt
@ -39,19 +39,9 @@ configure_file (
 include(EFLCheck)

 add_subdirectory(src/lib)
-add_subdirectory(src/examples/evas)
-add_subdirectory(src/examples/simple)
-add_subdirectory(src/examples/eo_isa)

-add_subdirectory(src/tests/mixin)
-add_subdirectory(src/tests/signals)
-add_subdirectory(src/tests/access)
-add_subdirectory(src/tests/constructors)
-add_subdirectory(src/tests/function_overrides)
-add_subdirectory(src/tests/composite_objects)
-add_subdirectory(src/tests/interface)
-
-add_subdirectory(src/tests/eo_suite EXCLUDE_FROM_ALL)
+add_subdirectory(src/tests EXCLUDE_FROM_ALL)
+add_subdirectory(src/examples)

 add_subdirectory(doc)

--- a/legacy/eobj/src/tests/access/CMakeLists.txt
+++ b/legacy/eobj/src/tests/access/CMakeLists.txt
@ -20,5 +20,6 @@ target_link_libraries(access
   )

 add_dependencies(access eo)
+add_dependencies(check access)

-add_test(Example_access access)
+add_test(Test_access access)
--- a/legacy/eobj/src/tests/composite_objects/CMakeLists.txt
+++ b/legacy/eobj/src/tests/composite_objects/CMakeLists.txt
@ -20,5 +20,6 @@ target_link_libraries(composite_objects
   )

 add_dependencies(composite_objects eo)
+add_dependencies(check composite_objects)

-add_test(Example_composite_objects composite_objects)
+add_test(Test_composite_objects composite_objects)
--- a/legacy/eobj/src/tests/constructors/CMakeLists.txt
+++ b/legacy/eobj/src/tests/constructors/CMakeLists.txt
@ -26,5 +26,6 @@ target_link_libraries(constructors
   )

 add_dependencies(constructors eo)
+add_dependencies(check constructors)

-add_test(Example_constructors constructors)
+add_test(Test_constructors constructors)
--- a/legacy/eobj/src/tests/eo_suite/CMakeLists.txt
+++ b/legacy/eobj/src/tests/eo_suite/CMakeLists.txt
@ -25,5 +25,6 @@ if (CHECK_ENABLED)
      )

   add_test(eo_suite eo_suite)
+   add_dependencies(eo_suite eo)
   add_dependencies(check eo_suite)
 endif (CHECK_ENABLED)
--- a/legacy/eobj/src/tests/function_overrides/CMakeLists.txt
+++ b/legacy/eobj/src/tests/function_overrides/CMakeLists.txt
@ -22,5 +22,6 @@ target_link_libraries(function_overrides
   )

 add_dependencies(function_overrides eo)
+add_dependencies(check function_overrides)

-add_test(Example_function_overrides function_overrides)
+add_test(Test_function_overrides function_overrides)
--- a/legacy/eobj/src/tests/interface/CMakeLists.txt
+++ b/legacy/eobj/src/tests/interface/CMakeLists.txt
@ -21,5 +21,6 @@ target_link_libraries(interface
   )

 add_dependencies(interface eo)
+add_dependencies(check interface)

-add_test(Example_interface interface)
+add_test(Test_interface interface)
--- a/legacy/eobj/src/tests/mixin/CMakeLists.txt
+++ b/legacy/eobj/src/tests/mixin/CMakeLists.txt
@ -22,5 +22,6 @@ target_link_libraries(mixin
   )

 add_dependencies(mixin eo)
+add_dependencies(check mixin)

-add_test(Example_mixin mixin)
+add_test(Test_mixin mixin)
--- a/legacy/eobj/src/tests/signals/CMakeLists.txt
+++ b/legacy/eobj/src/tests/signals/CMakeLists.txt
@ -19,5 +19,6 @@ target_link_libraries(signals
   )

 add_dependencies(signals eo)
+add_dependencies(check signals)

-add_test(Example_signals signals)
+add_test(Test_signals signals)