Menu
▾
▴
[Plplot-cvs] SF.net SVN: plplot:[12992] trunk/cmake/epa_build
|
From: <ai...@us...> - 2014-02-10 21:19:50
|
Revision: 12992
http://sourceforge.net/p/plplot/code/12992
Author: airwin
Date: 2014-02-10 21:19:43 +0000 (Mon, 10 Feb 2014)
Log Message:
-----------
Replace ENABLE_COMPREHENSIVE_PLPLOT_TEST option with the
COMPREHENSIVE_PLPLOT_TEST_INTERACTIVE and
COMPREHENSIVE_PLPLOT_TEST_NONINTERACTIVE options.
This allows much more convenient testing where you split
off the comprehensive interactive tests (which require
hands-on interaction from the user) with the comprehensive
noninteractive tests which can be run as a background job
with no interaction required from the user.
Modified Paths:
--------------
trunk/cmake/epa_build/CMakeLists.txt
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 2014-02-10 21:15:26 UTC (rev 12991)
+++ trunk/cmake/epa_build/CMakeLists.txt 2014-02-10 21:19:43 UTC (rev 12992)
@@ -307,13 +307,16 @@
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)
+# These options run the PLplot comprehensive test script (for
+# either/both the noninteractive and interactive subsets of the tests)
+# 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(COMPREHENSIVE_PLPLOT_TEST_NONINTERACTIVE "Use comprehensive noninteractive test for PLplot (which requires no interaction by the user but does require substantial CPU time and ~4GB of disk space)" OFF)
+option(COMPREHENSIVE_PLPLOT_TEST_INTERACTIVE "Use comprehensive interactive test for PLplot (which requires interaction by the user to click through some of the tests)" OFF)
+
# The parallel versions are for software packages that
# do not have race conditions for parallel builds or tests.
Modified: trunk/cmake/epa_build/plplot/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot/CMakeLists.txt 2014-02-10 21:15:26 UTC (rev 12991)
+++ trunk/cmake/epa_build/plplot/CMakeLists.txt 2014-02-10 21:19:43 UTC (rev 12992)
@@ -95,33 +95,37 @@
STEP_TARGETS configure build install test
)
-if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+if(COMPREHENSIVE_PLPLOT_TEST_INTERACTIVE OR COMPREHENSIVE_PLPLOT_TEST_NONINTERACTIVE)
string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
- "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --generator_string \"${CMAKE_GENERATOR}\" --cmake_added_options \"${blank_delimited_cmake_args}\" --build_command \"${EPA_BUILD_COMMAND} -j${NUMBER_PARALLEL_JOBS}\" --ctest_command \"${CMAKE_CTEST_COMMAND} -j${NUMBER_PARALLEL_JOBS} --timeout 15000 \" --do_ctest no --do_test_noninteractive no"
- )
+ if(COMPREHENSIVE_PLPLOT_TEST_INTERACTIVE)
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+ "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --generator_string \"${CMAKE_GENERATOR}\" --cmake_added_options \"${blank_delimited_cmake_args}\" --build_command \"${EPA_BUILD_COMMAND} -j${NUMBER_PARALLEL_JOBS}\" --ctest_command \"${CMAKE_CTEST_COMMAND} -j${NUMBER_PARALLEL_JOBS} --timeout 15000 \" --do_ctest no --do_test_noninteractive no"
+ )
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
- "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --generator_string \"${CMAKE_GENERATOR}\" --cmake_added_options \"${blank_delimited_cmake_args}\" --build_command \"${EPA_BUILD_COMMAND} -j${NUMBER_PARALLEL_JOBS}\" --ctest_command \"${CMAKE_CTEST_COMMAND} -j${NUMBER_PARALLEL_JOBS} --timeout 15000 \" --do_test_interactive no"
- )
+ add_custom_command(
+ OUTPUT
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+ COMMAND ${CMAKE_COMMAND} -E echo "comprehensive interactive tests"
+ COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+ APPEND
+ )
+ endif(COMPREHENSIVE_PLPLOT_TEST_INTERACTIVE)
- add_custom_command(
- OUTPUT
- ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
- COMMAND ${CMAKE_COMMAND} -E echo "comprehensive interactive tests"
- COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
- APPEND
- )
+ if(COMPREHENSIVE_PLPLOT_TEST_NONINTERACTIVE)
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+ "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --generator_string \"${CMAKE_GENERATOR}\" --cmake_added_options \"${blank_delimited_cmake_args}\" --build_command \"${EPA_BUILD_COMMAND} -j${NUMBER_PARALLEL_JOBS}\" --ctest_command \"${CMAKE_CTEST_COMMAND} -j${NUMBER_PARALLEL_JOBS} --timeout 15000 \" --do_test_interactive no"
+ )
- add_custom_command(
- OUTPUT
- ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
- COMMAND ${CMAKE_COMMAND} -E echo "comprehensive noninteractive tests"
- COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
- APPEND
- )
-else(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+ add_custom_command(
+ OUTPUT
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+ COMMAND ${CMAKE_COMMAND} -E echo "comprehensive noninteractive tests"
+ COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+ APPEND
+ )
+ endif(COMPREHENSIVE_PLPLOT_TEST_NONINTERACTIVE)
+else(COMPREHENSIVE_PLPLOT_TEST_INTERACTIVE OR COMPREHENSIVE_PLPLOT_TEST_NONINTERACTIVE)
# If ENABLE_COMPREHENSIVE_PLPLOT_TEST is not true, then just
# configure a pure default case and build and install it.
@@ -150,4 +154,4 @@
APPEND
)
-endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+endif(COMPREHENSIVE_PLPLOT_TEST_INTERACTIVE OR COMPREHENSIVE_PLPLOT_TEST_NONINTERACTIVE)
Modified: trunk/cmake/epa_build/plplot_lite/CMakeLists.txt
===================================================================
--- trunk/cmake/epa_build/plplot_lite/CMakeLists.txt 2014-02-10 21:15:26 UTC (rev 12991)
+++ trunk/cmake/epa_build/plplot_lite/CMakeLists.txt 2014-02-10 21:19:43 UTC (rev 12992)
@@ -69,7 +69,7 @@
find_file(IS_PLPLOT_SOURCE_TREE plcore.c
HINTS ${PLPLOT_LOCAL_SOURCE_DIR}/src
NO_DEFAULT_PATH
-)
+ )
if(NOT IS_PLPLOT_SOURCE_TREE)
message(FATAL_ERROR "epa_build not located in cmake/epa_build in a PLplot source tree")
@@ -94,33 +94,37 @@
STEP_TARGETS configure build install test
)
-if(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+if(COMPREHENSIVE_PLPLOT_TEST_INTERACTIVE OR COMPREHENSIVE_PLPLOT_TEST_NONINTERACTIVE)
string(REGEX REPLACE ";" " " blank_delimited_cmake_args "${cmake_args}")
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
- "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --generator_string \"${CMAKE_GENERATOR}\" --cmake_added_options \"${blank_delimited_cmake_args}\" --build_command \"${EPA_BUILD_COMMAND} -j${NUMBER_PARALLEL_JOBS}\" --ctest_command \"${CMAKE_CTEST_COMMAND} -j${NUMBER_PARALLEL_JOBS} --timeout 15000 \" --do_ctest no --do_test_noninteractive no"
- )
+ if(COMPREHENSIVE_PLPLOT_TEST_INTERACTIVE)
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+ "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --generator_string \"${CMAKE_GENERATOR}\" --cmake_added_options \"${blank_delimited_cmake_args}\" --build_command \"${EPA_BUILD_COMMAND} -j${NUMBER_PARALLEL_JOBS}\" --ctest_command \"${CMAKE_CTEST_COMMAND} -j${NUMBER_PARALLEL_JOBS} --timeout 15000 \" --do_ctest no --do_test_noninteractive no"
+ )
- file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
- "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --generator_string \"${CMAKE_GENERATOR}\" --cmake_added_options \"${blank_delimited_cmake_args}\" --build_command \"${EPA_BUILD_COMMAND} -j${NUMBER_PARALLEL_JOBS}\" --ctest_command \"${CMAKE_CTEST_COMMAND} -j${NUMBER_PARALLEL_JOBS} --timeout 15000 \" --do_test_interactive no"
- )
+ add_custom_command(
+ OUTPUT
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+ COMMAND ${CMAKE_COMMAND} -E echo "comprehensive interactive tests"
+ COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
+ APPEND
+ )
+ endif(COMPREHENSIVE_PLPLOT_TEST_INTERACTIVE)
- add_custom_command(
- OUTPUT
- ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
- COMMAND ${CMAKE_COMMAND} -E echo "comprehensive interactive tests"
- COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/interactive_comprehensive_test.sh
- APPEND
- )
+ if(COMPREHENSIVE_PLPLOT_TEST_NONINTERACTIVE)
+ file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+ "echo yes | ${EPA_BASE}/Source/build_${PACKAGE}/scripts/comprehensive_test.sh --generator_string \"${CMAKE_GENERATOR}\" --cmake_added_options \"${blank_delimited_cmake_args}\" --build_command \"${EPA_BUILD_COMMAND} -j${NUMBER_PARALLEL_JOBS}\" --ctest_command \"${CMAKE_CTEST_COMMAND} -j${NUMBER_PARALLEL_JOBS} --timeout 15000 \" --do_test_interactive no"
+ )
- add_custom_command(
- OUTPUT
- ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
- COMMAND ${CMAKE_COMMAND} -E echo "comprehensive noninteractive tests"
- COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
- APPEND
- )
-else(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+ add_custom_command(
+ OUTPUT
+ ${EPA_BASE}/Stamp/build_${PACKAGE}/build_${PACKAGE}-test
+ COMMAND ${CMAKE_COMMAND} -E echo "comprehensive noninteractive tests"
+ COMMAND ${ENV_EXECUTABLE} PATH=${EPA_PATH} ${BASH_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/noninteractive_comprehensive_test.sh
+ APPEND
+ )
+ endif(COMPREHENSIVE_PLPLOT_TEST_NONINTERACTIVE)
+else(COMPREHENSIVE_PLPLOT_TEST_INTERACTIVE OR COMPREHENSIVE_PLPLOT_TEST_NONINTERACTIVE)
# If ENABLE_COMPREHENSIVE_PLPLOT_TEST is not true, then just
# configure a pure default case and build and install it.
@@ -149,4 +153,4 @@
APPEND
)
-endif(ENABLE_COMPREHENSIVE_PLPLOT_TEST)
+endif(COMPREHENSIVE_PLPLOT_TEST_INTERACTIVE OR COMPREHENSIVE_PLPLOT_TEST_NONINTERACTIVE)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
