[Plplot-cvs] SF.net SVN: plplot:[12868] trunk/cmake/epa_build

[<ai...@us...>]

Revision: 12868
          http://sourceforge.net/p/plplot/code/12868
Author:   airwin
Date:     2013-12-16 00:14:36 +0000 (Mon, 16 Dec 2013)
Log Message:
-----------
Add the ENABLE_COMPREHENSIVE_PLPLOT_TEST option to epa_build which
runs the PLplot comprehensive test script for the exact same build
environment (i.e., cmake options, environment variables, buildtools
that have been built, and dependencies that have been built) as used
for the epa_build of plplot and plplot_lite.

Modified Paths:
--------------
    trunk/cmake/epa_build/CMakeLists.txt
    trunk/cmake/epa_build/README
    trunk/cmake/epa_build/plplot/CMakeLists.txt
    trunk/cmake/epa_build/plplot_lite/CMakeLists.txt

Modified: trunk/cmake/epa_build/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/CMakeLists.txt	2013-12-16 00:03:10 UTC (rev 12867)
+++ trunk/cmake/epa_build/CMakeLists.txt	2013-12-16 00:14:36 UTC (rev 12868)
@@ -307,6 +307,12 @@
   list(APPEND EPA_MAKE_COMMAND V=1)
 endif(CMAKE_VERBOSE_MAKEFILE)
 
+# This option runs the PLplot comprehensive test script for
+# the exact same build environment (i.e., cmake options, environment
+# variables, buildtools that have been built, and dependencies that
+# have been built) as used for the epa_build of plplot and
+# plplot_lite.
+option(ENABLE_COMPREHENSIVE_PLPLOT_TEST "Use comprehensive test for PLplot (which requires substantial CPU time and ~4GB of disk space)" OFF)
 
 # The parallel versions are for software packages that
 # do not have race conditions for parallel builds or tests.

Modified: trunk/cmake/epa_build/README
===================================================================
--- trunk/cmake/epa_build/README	2013-12-16 00:03:10 UTC (rev 12867)
+++ trunk/cmake/epa_build/README	2013-12-16 00:14:36 UTC (rev 12868)
@@ -155,6 +155,13 @@
 # Check build_plplot.out for any errors
 less build_plplot.out
 
+# N.B. add the option -DENABLE_COMPREHENSIVE_PLPLOT_TEST=ON to the
+# above cmake command to run a comprehensive test script just after
+# PLplot is built and installed for both the build_plplot and
+# build_plplot_lite targets.  This test script (familiar to PLplot
+# developers) requires substantial extra CPU time and ~4GB of extra
+# disk space to run.
+
 2. Windows platforms
 
 Very similar to above, but I will fill in variations that I used

Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot/CMakeLists.txt	2013-12-16 00:03:10 UTC (rev 12867)
+++ trunk/cmake/epa_build/plplot/CMakeLists.txt	2013-12-16 00:14:36 UTC (rev 12868)
@@ -78,6 +78,14 @@
   determine_msys_path(EPA_PATH "${EPA_PATH}")
 endif(MSYS_PLATFORM)
 
+if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+  string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\""
+    )
+  set(TEST_COMMAND TEST_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh)
+endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+
 ExternalProject_Add(
   build_${PACKAGE}
   DEPENDS "${dependencies_targets}"
@@ -86,6 +94,6 @@
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
   TEST_BEFORE_INSTALL OFF
-  TEST_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} test_noninteractive
+  ${TEST_COMMAND}
   STEP_TARGETS configure build install test
   )

Modified: trunk/cmake/epa_build/plplot_lite/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot_lite/CMakeLists.txt	2013-12-16 00:03:10 UTC (rev 12867)
+++ trunk/cmake/epa_build/plplot_lite/CMakeLists.txt	2013-12-16 00:14:36 UTC (rev 12868)
@@ -82,6 +82,14 @@
   determine_msys_path(EPA_PATH "${EPA_PATH}")
 endif(MSYS_PLATFORM)
 
+if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+  string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
+  file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh
+    "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --cmake_added_options \"${blank_delimited_cmake_args}\""
+    )
+  set(TEST_COMMAND TEST_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/comprehensive_test.sh)
+endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+
 ExternalProject_Add(
   build_${PACKAGE}
   DEPENDS "${dependencies_targets}"
@@ -90,6 +98,6 @@
   BUILD_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND}
   INSTALL_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} install
   TEST_BEFORE_INSTALL OFF
-  TEST_COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${EPA_PARALLEL_BUILD_COMMAND} test_noninteractive
+  ${TEST_COMMAND}
   STEP_TARGETS configure build install test
   )

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.