Skip to content

Commit

Permalink
Refs #4316 fix ctest on mac; hope it works elsewhere
Browse files Browse the repository at this point in the history
  • Loading branch information
Janik Zikovsky committed Dec 22, 2011
1 parent de4bda7 commit e4e3251
Showing 1 changed file with 13 additions and 4 deletions.
17 changes: 13 additions & 4 deletions Code/Mantid/MantidPlot/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -813,18 +813,27 @@ set ( MANTIDPLOT_TEST_PY_FILES
MantidPlotSliceViewerTest.py
)

if ( 1 )
message (STATUS "Your CMAKE_SYSTEM string is '${CMAKE_SYSTEM}'")
message (STATUS "Your CMAKE_SYSTEM_NAME string is '${CMAKE_SYSTEM_NAME}'")
message (STATUS "Your CMAKE_BINARY_DIR string is '${CMAKE_BINARY_DIR}'")
message (STATUS "Your BIN_DIR string is '${BIN_DIR}'")
message (STATUS "Your CMAKE_LIBRARY_OUTPUT_DIRECTORY string is '${CMAKE_LIBRARY_OUTPUT_DIRECTORY}'")
message (STATUS "Your CMAKE_CFG_INTDIR string is '${CMAKE_CFG_INTDIR}'")
message (STATUS "Your CMAKE_CURRENT_BINARY_DIR string is '${CMAKE_CURRENT_BINARY_DIR}'")
endif ()


# Check system version
if ( ${CMAKE_SYSTEM} MATCHES ".*\\.el5" )
# This is RHEL5. GUI tests hang on this platform for some reason
message ( "RHEL5 hangs on GUI tests. Disabling MantidPlot python tests." )
else ()
#message (STATUS "Your CMAKE_SYSTEM string is '${CMAKE_SYSTEM}'")
#message (STATUS "Your CMAKE_SYSTEM_NAME string is '${CMAKE_SYSTEM_NAME}'")


# Make a ctest target for each file
foreach ( PYFILE ${MANTIDPLOT_TEST_PY_FILES} )
# Add the test. Name of test = name of the file
ADD_TEST( ${PYFILE} ${CMAKE_BINARY_DIR}/${BIN_DIR}/MantidPlot -xq ${CMAKE_CURRENT_SOURCE_DIR}/test/${PYFILE} )
ADD_TEST( ${PYFILE} ${CMAKE_LIBRARY_OUTPUT_DIRECTORY}/${BIN_DIR}/MantidPlot -xq ${CMAKE_CURRENT_SOURCE_DIR}/test/${PYFILE} )
# Add an environment property so that the script can find the source of xmlrunner
set_tests_properties( ${PYFILE} PROPERTIES ENVIRONMENT "MANTID_SOURCE=${CMAKE_SOURCE_DIR}")
endforeach ()
Expand Down

0 comments on commit e4e3251

Please sign in to comment.