[Cmake-commits] CMake branch, next, updated. v2.8.10.2-2608-gb3cb0fd

[Brad King]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  b3cb0fd09db2416f050cf6170559a41cbf9e094d (commit)
       via  875eb8e158e9b8541b2efab09df44b32c6854f04 (commit)
      from  fe7fd9a53c110b1af7ac765affa21e2b97858e11 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3cb0fd09db2416f050cf6170559a41cbf9e094d
commit b3cb0fd09db2416f050cf6170559a41cbf9e094d
Merge: fe7fd9a 875eb8e
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Mar 22 09:15:04 2013 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Mar 22 09:15:04 2013 -0400

    Merge topic 'cygwin_fd_setsize' into next
    
    875eb8e CTest: Add test for running many tests in parallel


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=875eb8e158e9b8541b2efab09df44b32c6854f04
commit 875eb8e158e9b8541b2efab09df44b32c6854f04
Author:     Paul Kunysch <kunysch at me.com>
AuthorDate: Wed Mar 6 00:14:58 2013 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Mar 22 09:02:12 2013 -0400

    CTest: Add test for running many tests in parallel
    
    In particular, this checks that CTest's use of select() has a sufficient
    file descriptor set size limit (FD_SETSIZE) to handle many child
    processes at the same time.  Running 20 tests requires more than 64
    descriptors, the Cygwin default that we override.

diff --git a/Tests/CMakeLists.txt b/Tests/CMakeLists.txt
index e07bb69..283c846 100644
--- a/Tests/CMakeLists.txt
+++ b/Tests/CMakeLists.txt
@@ -2085,6 +2085,15 @@ ${CMake_BINARY_DIR}/bin/cmake -DVERSION=master -P ${CMake_SOURCE_DIR}/Utilities/
 
   add_test(CTestBatchTest ${CMAKE_CTEST_COMMAND} -B)
 
+  configure_file(
+    "${CMake_SOURCE_DIR}/Tests/CTestTestFdSetSize/test.cmake.in"
+    "${CMake_BINARY_DIR}/Tests/CTestTestFdSetSize/test.cmake"
+    @ONLY ESCAPE_QUOTES)
+  add_test(CTestTestFdSetSize ${CMAKE_CTEST_COMMAND}
+    -S "${CMake_BINARY_DIR}/Tests/CTestTestFdSetSize/test.cmake" -j20 -V --timeout 120
+    --output-log "${CMake_BINARY_DIR}/Tests/CTestTestFdSetSize/testOutput.log"
+    )
+
   # Use macro, not function so that build can still be driven by CMake 2.4.
   # After 2.6 is required, this could be a function without the extra 'set'
   # calls.
diff --git a/Tests/CTestTestFdSetSize/CMakeLists.txt b/Tests/CTestTestFdSetSize/CMakeLists.txt
new file mode 100644
index 0000000..f382746
--- /dev/null
+++ b/Tests/CTestTestFdSetSize/CMakeLists.txt
@@ -0,0 +1,9 @@
+cmake_minimum_required (VERSION 2.8.10)
+project (CTestTestFdSetSize)
+include (CTest)
+
+add_executable (Sleep sleep.c)
+
+foreach (index RANGE 1 20)
+  add_test (TestSleep${index} Sleep)
+endforeach ()
diff --git a/Tests/CTestTestFdSetSize/CTestConfig.cmake b/Tests/CTestTestFdSetSize/CTestConfig.cmake
new file mode 100644
index 0000000..b5f3c33
--- /dev/null
+++ b/Tests/CTestTestFdSetSize/CTestConfig.cmake
@@ -0,0 +1 @@
+set(CTEST_PROJECT_NAME "CTestTestFdSetSize")
diff --git a/Tests/CTestTestFdSetSize/sleep.c b/Tests/CTestTestFdSetSize/sleep.c
new file mode 100644
index 0000000..b2e6a87
--- /dev/null
+++ b/Tests/CTestTestFdSetSize/sleep.c
@@ -0,0 +1,16 @@
+#if defined(_WIN32)
+# include <windows.h>
+#else
+# include <unistd.h>
+#endif
+
+/* sleeps for 0.1 second */
+int main(int argc, char** argv)
+{
+#if defined(_WIN32)
+  Sleep(100);
+#else
+  usleep(100 * 1000);
+#endif
+  return 0;
+}
diff --git a/Tests/CTestTestFdSetSize/test.cmake.in b/Tests/CTestTestFdSetSize/test.cmake.in
new file mode 100644
index 0000000..c24f505
--- /dev/null
+++ b/Tests/CTestTestFdSetSize/test.cmake.in
@@ -0,0 +1,23 @@
+cmake_minimum_required(VERSION 2.8.10)
+
+# Settings:
+set(CTEST_DASHBOARD_ROOT                "@CMake_BINARY_DIR@/Tests/CTestTest")
+set(CTEST_SITE                          "@SITE@")
+set(CTEST_BUILD_NAME                    "CTestTest- at BUILDNAME@-FdSetSize")
+
+set(CTEST_SOURCE_DIRECTORY              "@CMake_SOURCE_DIR@/Tests/CTestTestFdSetSize")
+set(CTEST_BINARY_DIRECTORY              "@CMake_BINARY_DIR@/Tests/CTestTestFdSetSize")
+set(CTEST_CVS_COMMAND                   "@CVSCOMMAND@")
+set(CTEST_CMAKE_GENERATOR               "@CMAKE_TEST_GENERATOR@")
+set(CTEST_CMAKE_GENERATOR_TOOLSET       "@CMAKE_TEST_GENERATOR_TOOLSET@")
+set(CTEST_BUILD_CONFIGURATION           "$ENV{CMAKE_CONFIG_TYPE}")
+set(CTEST_COVERAGE_COMMAND              "@COVERAGE_COMMAND@")
+set(CTEST_NOTES_FILES                   "${CTEST_SCRIPT_DIRECTORY}/${CTEST_SCRIPT_NAME}")
+
+ctest_start(Experimental)
+ctest_configure(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+message("build")
+ctest_build(BUILD "${CTEST_BINARY_DIRECTORY}" RETURN_VALUE res)
+message("test")
+ctest_test(BUILD "${CTEST_BINARY_DIRECTORY}" PARALLEL_LEVEL 20 RETURN_VALUE res)
+message("done")

-----------------------------------------------------------------------

Summary of changes:
 Tests/CMakeLists.txt                               |    9 ++++++++
 Tests/CTestTestFdSetSize/CMakeLists.txt            |    9 ++++++++
 Tests/CTestTestFdSetSize/CTestConfig.cmake         |    1 +
 .../sleep.c                                        |    6 ++--
 .../test.cmake.in                                  |   22 ++++++++++----------
 5 files changed, 33 insertions(+), 14 deletions(-)
 create mode 100644 Tests/CTestTestFdSetSize/CMakeLists.txt
 create mode 100644 Tests/CTestTestFdSetSize/CTestConfig.cmake
 copy Tests/{CTestTestZeroTimeout => CTestTestFdSetSize}/sleep.c (71%)
 copy Tests/{CTestTestCrash => CTestTestFdSetSize}/test.cmake.in (60%)


hooks/post-receive
-- 
CMake