[cig-commits] [commit] master: Update test scripts to use correct Python binary (967f45c)
cig_noreply at geodynamics.org
cig_noreply at geodynamics.org
Wed Oct 8 17:06:15 PDT 2014
Repository : https://github.com/geodynamics/vc
On branch : master
Link : https://github.com/geodynamics/vc/compare/23464fca3efa2b6ad7ee0ce8f60c225b18b49741...e4325192ad1118379f46ba66899cb98143d09e04
>---------------------------------------------------------------
commit 967f45c9e52d9bd5f7530cee8ee2185ef1a11547
Author: Eric Heien <emheien at ucdavis.edu>
Date: Thu Sep 25 17:03:51 2014 -0700
Update test scripts to use correct Python binary
>---------------------------------------------------------------
967f45c9e52d9bd5f7530cee8ee2185ef1a11547
examples/CMakeLists.txt | 38 ++++++++++++++++++++++++++------------
1 file changed, 26 insertions(+), 12 deletions(-)
diff --git a/examples/CMakeLists.txt b/examples/CMakeLists.txt
index a5d5cbb..ece6640 100644
--- a/examples/CMakeLists.txt
+++ b/examples/CMakeLists.txt
@@ -1,6 +1,7 @@
# Set the example directory path
SET(VC_EXAMPLE_DIR ${CMAKE_CURRENT_SOURCE_DIR}/)
SET(VC_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../src/)
+SET(QUAKELIB_BINARY_DIR ${CMAKE_CURRENT_BINARY_DIR}/../quakelib/)
# Copy the fault traces to the build directory for use in the tests
FILE(COPY ${VC_EXAMPLE_DIR}/fault_traces DESTINATION ${CMAKE_CURRENT_BINARY_DIR}/../)
@@ -73,21 +74,28 @@ FOREACH(NPROC ${NUM_PROCS})
# Check that the results are internally self consistent
ADD_TEST(NAME test_consistent_P${NPROC}_${TAPER}_${RES} WORKING_DIRECTORY ${TEST_DIR}
- COMMAND ${CHECK_SCRIPT} --event_file ${EVENT_FILE} --sweep_file ${SWEEP_FILE} --check_consistent)
- SET_TESTS_PROPERTIES (test_consistent_P${NPROC}_${TAPER}_${RES} PROPERTIES DEPENDS run_P${NPROC}_${TAPER}_${RES})
+ COMMAND ${PYTHON_EXECUTABLE} ${CHECK_SCRIPT} --event_file ${EVENT_FILE} --sweep_file ${SWEEP_FILE} --check_consistent)
+ SET_TESTS_PROPERTIES (test_consistent_P${NPROC}_${TAPER}_${RES} PROPERTIES
+ DEPENDS run_P${NPROC}_${TAPER}_${RES}
+ ENVIRONMENT "PYTHONPATH=${QUAKELIB_BINARY_DIR}/python/")
# Check that the mean slip is near our expectations
IF (NOT ${MEANSLIP} EQUAL 0)
ADD_TEST(NAME test_slip_P${NPROC}_${TAPER}_${RES} WORKING_DIRECTORY ${TEST_DIR}
- COMMAND ${CHECK_SCRIPT} --event_file ${EVENT_FILE} --sweep_file ${SWEEP_FILE} --mean_slip ${MEANSLIP})
- SET_TESTS_PROPERTIES (test_slip_P${NPROC}_${TAPER}_${RES} PROPERTIES DEPENDS run_P${NPROC}_${TAPER}_${RES})
+ COMMAND ${PYTHON_EXECUTABLE} ${CHECK_SCRIPT} --event_file ${EVENT_FILE} --sweep_file ${SWEEP_FILE} --mean_slip ${MEANSLIP})
+ SET_TESTS_PROPERTIES (test_slip_P${NPROC}_${TAPER}_${RES} PROPERTIES
+ DEPENDS run_P${NPROC}_${TAPER}_${RES}
+ ENVIRONMENT "PYTHONPATH=${QUAKELIB_BINARY_DIR}/python/")
ENDIF (NOT ${MEANSLIP} EQUAL 0)
# Check that the mean interevent time is near our expectations
IF (NOT ${INTEREVENT} EQUAL 0)
+
ADD_TEST(NAME test_interevent_P${NPROC}_${TAPER}_${RES} WORKING_DIRECTORY ${TEST_DIR}
- COMMAND ${CHECK_SCRIPT} --event_file ${EVENT_FILE} --sweep_file ${SWEEP_FILE} --mean_interevent ${INTEREVENT})
- SET_TESTS_PROPERTIES (test_interevent_P${NPROC}_${TAPER}_${RES} PROPERTIES DEPENDS run_P${NPROC}_${TAPER}_${RES})
+ COMMAND ${PYTHON_EXECUTABLE} ${CHECK_SCRIPT} --event_file ${EVENT_FILE} --sweep_file ${SWEEP_FILE} --mean_interevent ${INTEREVENT})
+ SET_TESTS_PROPERTIES (test_interevent_P${NPROC}_${TAPER}_${RES} PROPERTIES
+ DEPENDS run_P${NPROC}_${TAPER}_${RES}
+ ENVIRONMENT "PYTHONPATH=${QUAKELIB_BINARY_DIR}/python/")
ENDIF(NOT ${INTEREVENT} EQUAL 0)
ENDFOREACH(RES ${RESOLUTIONS})
ENDFOREACH(TAPER_IND RANGE ${NUM_TAPER})
@@ -140,24 +148,30 @@ FOREACH(TAPER_IND RANGE ${NUM_TAPER})
# Check that the results are internally self consistent
ADD_TEST(NAME test_two_consistent_${TAPER}_${RES} WORKING_DIRECTORY ${TEST_DIR}
- COMMAND ${CHECK_SCRIPT} --event_file ${EVENT_FILE_TWO} --sweep_file ${SWEEP_FILE_TWO} --check_consistent)
- SET_TESTS_PROPERTIES (test_two_consistent_${TAPER}_${RES} PROPERTIES DEPENDS run_two_${TAPER}_${RES})
+ COMMAND ${PYTHON_EXECUTABLE} ${CHECK_SCRIPT} --event_file ${EVENT_FILE_TWO} --sweep_file ${SWEEP_FILE_TWO} --check_consistent)
+ SET_TESTS_PROPERTIES (test_two_consistent_${TAPER}_${RES} PROPERTIES
+ DEPENDS run_two_${TAPER}_${RES}
+ ENVIRONMENT "PYTHONPATH=${QUAKELIB_BINARY_DIR}/python/")
# Check that the mean slip is near our expectations
# These two faults have same slip rate as single fault, so using
# same mean slip values
IF (NOT ${MEANSLIP} EQUAL 0)
ADD_TEST(NAME test_two_slip_${TAPER}_${RES} WORKING_DIRECTORY ${TEST_DIR}
- COMMAND ${CHECK_SCRIPT} --event_file ${EVENT_FILE_TWO} --sweep_file ${SWEEP_FILE_TWO} --mean_slip ${MEANSLIP})
- SET_TESTS_PROPERTIES (test_two_slip_${TAPER}_${RES} PROPERTIES DEPENDS run_two_${TAPER}_${RES})
+ COMMAND ${PYTHON_EXECUTABLE} ${CHECK_SCRIPT} --event_file ${EVENT_FILE_TWO} --sweep_file ${SWEEP_FILE_TWO} --mean_slip ${MEANSLIP})
+ SET_TESTS_PROPERTIES (test_two_slip_${TAPER}_${RES} PROPERTIES
+ DEPENDS run_two_${TAPER}_${RES}
+ ENVIRONMENT "PYTHONPATH=${QUAKELIB_BINARY_DIR}/python/")
ENDIF (NOT ${MEANSLIP} EQUAL 0)
# Check that the mean interevent time is near our expectations
# TODO: These tests fail, Kasey needs to figure out why
#IF (NOT ${INTEREVENT} EQUAL 0)
# ADD_TEST(NAME test_two_interevent_${TAPER}_${RES} WORKING_DIRECTORY ${TEST_DIR}
- # COMMAND ${CHECK_SCRIPT} --event_file ${EVENT_FILE_TWO} --sweep_file ${SWEEP_FILE_TWO} --mean_interevent ${INTEREVENT})
- # SET_TESTS_PROPERTIES (test_two_interevent_${TAPER}_${RES} PROPERTIES DEPENDS run_two_${TAPER}_${RES})
+ # COMMAND ${PYTHON_EXECUTABLE} ${CHECK_SCRIPT} --event_file ${EVENT_FILE_TWO} --sweep_file ${SWEEP_FILE_TWO} --mean_interevent ${INTEREVENT})
+ # SET_TESTS_PROPERTIES (test_two_interevent_${TAPER}_${RES} PROPERTIES
+ # DEPENDS run_two_${TAPER}_${RES}
+ # ENVIRONMENT "PYTHONPATH=${QUAKELIB_BINARY_DIR}/python/")
#ENDIF(NOT ${INTEREVENT} EQUAL 0)
ENDFOREACH(RES ${RESOLUTIONS_TWO})
ENDFOREACH(TAPER_IND RANGE ${NUM_TAPER})
More information about the CIG-COMMITS
mailing list