[cmake-commits] alex committed CMakeLists.txt 1.36 1.37

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Tests
In directory public:/mounts/ram/cvs-serv17476/Tests

Modified Files:
	CMakeLists.txt 
Log Message:
ENH: add support for the Syllable OS (http://www.syllable.org)
major issues: 
-access() doesn't return false for an empty string (#ifdefed in cmake)
-dlopen() doesn't return 0 on failure (#ifdefed in cmake and fixed now in Syllable)
-the kwsys and Bootstrap tests fail with timeout due to the fact that I'm doing all that in qemu, which is quite slow
-RPATH is now supported, so without modifying the test adapting DLL_PATH in Syllable is required for the tests to succeed
-the Plugin test fails with an undefined reference to example_exe_function() in example_mod_1, it seems this isn't supported under Syllable

Alex



Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Tests/CMakeLists.txt,v
retrieving revision 1.36
retrieving revision 1.37
diff -u -d -r1.36 -r1.37
--- CMakeLists.txt	8 Nov 2007 15:38:26 -0000	1.36
+++ CMakeLists.txt	24 Nov 2007 01:45:49 -0000	1.37
@@ -443,30 +443,61 @@
     --test-command exec4
     )
 
-  ADD_TEST(JumpWithLibOut  ${CMAKE_CTEST_COMMAND}
-    --build-and-test
-    "${CMake_SOURCE_DIR}/Tests/Jump"
-    "${CMake_BINARY_DIR}/Tests/Jump/WithLibOut"
-    --build-exe-dir "${CMake_BINARY_DIR}/Tests/Jump/WithLibOut/Executable"
-    --build-project Jump
-    --build-generator ${CMAKE_TEST_GENERATOR}
-    --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-    --build-options
-    -DLIBRARY_OUTPUT_PATH:PATH=${CMake_BINARY_DIR}/Tests/Jump/WithLibOut/Lib
-    --test-command jumpExecutable
-    )
+  IF("${CMAKE_SYSTEM_NAME}" MATCHES syllable)
+
+# RPATH isn't supported under Syllable, so the tests don't
+# find their libraries. In order to fix that LIBRARY_OUTPUT_DIR
+# in the tests would have to be adjusted to ${EXECUTABLE_OUTPUT_DIR}/lib .
+# For now we just require on Syllable that the user adjusts the DLL_PATH 
+# environment variable, so except the two tests below all other tests will succeed.
+
+    SET(_DLL_PATH "$ENV{DLL_PATH}")
+    IF(NOT "${_DLL_PATH}" MATCHES "^(.*:)?\@bindir\@/\\.(:.*)?$")
+      MESSAGE(FATAL_ERROR "In order to successfully run the CMake test suite on Syllable you need to add \"\@bindir\@/.\" to the DLL_PATH environment variable")
+    ENDIF(NOT "${_DLL_PATH}" MATCHES "^(.*:)?\@bindir\@/\\.(:.*)?$")
+    IF(NOT "${_DLL_PATH}" MATCHES "^(.*:)?\@bindir\@/\\.\\./lib(:.*)?$")
+      MESSAGE(FATAL_ERROR "In order to successfully run the CMake test suite on Syllable you need to add \"\@bindir\@/../lib\" to the DLL_PATH environment variable")
+    ENDIF(NOT "${_DLL_PATH}" MATCHES "^(.*:)?\@bindir\@/\\.\\./lib(:.*)?$")
+
+  ELSE("${CMAKE_SYSTEM_NAME}" MATCHES syllable)
+
+    ADD_TEST(JumpWithLibOut  ${CMAKE_CTEST_COMMAND}
+      --build-and-test
+      "${CMake_SOURCE_DIR}/Tests/Jump"
+      "${CMake_BINARY_DIR}/Tests/Jump/WithLibOut"
+      --build-exe-dir "${CMake_BINARY_DIR}/Tests/Jump/WithLibOut/Executable"
+      --build-project Jump
+      --build-generator ${CMAKE_TEST_GENERATOR}
+      --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+      --build-options
+      -DLIBRARY_OUTPUT_PATH:PATH=${CMake_BINARY_DIR}/Tests/Jump/WithLibOut/Lib
+      --test-command jumpExecutable
+      )
+
+    ADD_TEST(JumpNoLibOut  ${CMAKE_CTEST_COMMAND}
+      --build-and-test
+      "${CMake_SOURCE_DIR}/Tests/Jump"
+      "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut"
+      --build-exe-dir "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut/Executable"
+      --build-run-dir "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut/Executable"
+      --build-project Jump
+      --build-generator ${CMAKE_TEST_GENERATOR}
+      --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+      --test-command jumpExecutable
+      )
+
+    ADD_TEST(Plugin ${CMAKE_CTEST_COMMAND}
+      --build-and-test
+      "${CMake_SOURCE_DIR}/Tests/Plugin"
+      "${CMake_BINARY_DIR}/Tests/Plugin"
+      --build-generator ${CMAKE_TEST_GENERATOR}
+      --build-project Plugin
+      --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
+      --build-two-config
+      --test-command bin/example)
+
+  ENDIF("${CMAKE_SYSTEM_NAME}" MATCHES syllable)
 
-  ADD_TEST(JumpNoLibOut  ${CMAKE_CTEST_COMMAND}
-    --build-and-test
-    "${CMake_SOURCE_DIR}/Tests/Jump"
-    "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut"
-    --build-exe-dir "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut/Executable"
-    --build-run-dir "${CMake_BINARY_DIR}/Tests/Jump/NoLibOut/Executable"
-    --build-project Jump
-    --build-generator ${CMAKE_TEST_GENERATOR}
-    --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-    --test-command jumpExecutable
-    )
 
   ADD_TEST(linkorder1 ${CMAKE_CTEST_COMMAND}
     --build-and-test
@@ -488,16 +519,6 @@
     --test-command Exec2
     )
 
-  ADD_TEST(Plugin ${CMAKE_CTEST_COMMAND}
-    --build-and-test
-    "${CMake_SOURCE_DIR}/Tests/Plugin"
-    "${CMake_BINARY_DIR}/Tests/Plugin"
-    --build-generator ${CMAKE_TEST_GENERATOR}
-    --build-project Plugin
-    --build-makeprogram ${CMAKE_TEST_MAKEPROGRAM}
-    --build-two-config
-    --test-command bin/example)
-
   IF(NOT CMAKE_TEST_DIFFERENT_GENERATOR)
     ADD_TEST(kwsys ${CMAKE_CTEST_COMMAND}
       --build-and-test