Commit c787852e authored by Ben Boeckel's avatar Ben Boeckel

PARAVIEW_DATA_ROOT is now always available

Change-Id: Iac1d5afb7d990d4fea68f29cc1ebb9b30e230d6c
parent 11e9bdff
......@@ -256,7 +256,7 @@ find_file(smooth_flash NAMES smooth.flash
DOC "Path to smooth.flash data file."
NO_DEFAULT_PATH)
mark_as_advanced(smooth_flash)
if (EXISTS "${smooth_flash}" AND PARAVIEW_DATA_ROOT)
if (EXISTS "${smooth_flash}")
# we configure the file since we need to point to smooth_flash.
configure_file("${CMAKE_CURRENT_SOURCE_DIR}/AMRStreaming.xml.in"
"${CMAKE_CURRENT_BINARY_DIR}/AMRStreaming.xml" @ONLY)
......@@ -632,96 +632,90 @@ set(TESTS_WITH_MULTI_SERVERS_3
${CMAKE_CURRENT_SOURCE_DIR}/TestMultiServer3.xml
)
IF (PARAVIEW_DATA_ROOT)
set (TESTS_WITHOUT_BASELINES
${TESTS_WITHOUT_BASELINES}
${TESTS_WITH_INLINE_COMPARES})
ENDIF (PARAVIEW_DATA_ROOT)
set (TESTS_WITHOUT_BASELINES
${TESTS_WITHOUT_BASELINES}
${TESTS_WITH_INLINE_COMPARES})
add_client_tests("pv"
TEST_SCRIPTS ${TESTS_WITHOUT_BASELINES}
)
IF (PARAVIEW_DATA_ROOT)
add_client_tests("pv"
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${TESTS_WITH_BASELINES}
)
add_client_tests("pv"
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${TESTS_WITH_BASELINES}
)
add_client_server_tests("pvcs"
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${TESTS_WITH_BASELINES}
)
add_client_server_tests("pvcs"
add_client_server_tests("pvcs"
TEST_SCRIPTS ${TESTS_WITH_INLINE_COMPARES}
)
IF (PARAVIEW_CLIENT_RENDER_SERVER_TESTS)
add_client_render_server_tests("pvcrs"
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${TESTS_WITH_BASELINES}
)
add_client_server_tests("pvcs"
add_client_render_server_tests("pvcrs"
TEST_SCRIPTS ${TESTS_WITH_INLINE_COMPARES}
)
IF (PARAVIEW_CLIENT_RENDER_SERVER_TESTS)
add_client_render_server_tests("pvcrs"
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${TESTS_WITH_BASELINES}
)
add_client_render_server_tests("pvcrs"
TEST_SCRIPTS ${TESTS_WITH_INLINE_COMPARES}
)
ENDIF (PARAVIEW_CLIENT_RENDER_SERVER_TESTS)
ENDIF (PARAVIEW_CLIENT_RENDER_SERVER_TESTS)
# TODO: remote rendering tests and reverse connect tests.
add_multi_client_tests("pvcs-collab"
add_multi_client_tests("pvcs-collab"
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${TESTS_WITH_BASELINES})
add_multi_server_tests("pvcs-multi-servers" 3
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${TESTS_WITH_MULTI_SERVERS_3})
set (TileDisplayScatterPlot-2x1_THRESHOLD 40)
add_tile_display_tests("pvcs-tile-display" 2 1
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/TileDisplayScatterPlot-2x1.xml)
set (TileDisplayScatterPlot-2x2_THRESHOLD 40)
add_tile_display_tests("pvcs-tile-display" 2 2
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/TileDisplayScatterPlot-2x2.xml)
set (TileDisplay3DTesting-1x2_THRESHOLD 40)
add_tile_display_tests("pvcs-tile-display" 1 2
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/TileDisplay3DTesting-1x2.xml)
set (TileDisplay3DTesting-2x1_THRESHOLD 40)
add_tile_display_tests("pvcs-tile-display" 2 1
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/TileDisplay3DTesting-2x1.xml)
set (TileDisplay3DTesting-2x2_THRESHOLD 40)
add_tile_display_tests("pvcs-tile-display" 2 2
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/TileDisplay3DTesting-2x2.xml)
#------------------------------------------------------------------
# Add tests that test command line arguments (among other things).
#------------------------------------------------------------------
if (TARGET paraview)
# The state file need to point to the correct data file. We do that by
# configuring the state file.
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/exodusStateFile.3.14.1.pvsm.in"
"${CMAKE_CURRENT_BINARY_DIR}/exodusStateFile.3.14.1.pvsm" @ONLY)
add_pv_test("pv" "_DISABLE_C"
COMMAND --client $<TARGET_FILE:paraview>
--enable-bt
-dr
--test-directory=${PARAVIEW_TEST_DIR}
--state=${CMAKE_CURRENT_BINARY_DIR}/exodusStateFile.3.14.1.pvsm
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${TESTS_WITH_BASELINES})
add_multi_server_tests("pvcs-multi-servers" 3
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${TESTS_WITH_MULTI_SERVERS_3})
set (TileDisplayScatterPlot-2x1_THRESHOLD 40)
add_tile_display_tests("pvcs-tile-display" 2 1
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/TileDisplayScatterPlot-2x1.xml)
set (TileDisplayScatterPlot-2x2_THRESHOLD 40)
add_tile_display_tests("pvcs-tile-display" 2 2
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/TileDisplayScatterPlot-2x2.xml)
set (TileDisplay3DTesting-1x2_THRESHOLD 40)
add_tile_display_tests("pvcs-tile-display" 1 2
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/TileDisplay3DTesting-1x2.xml)
set (TileDisplay3DTesting-2x1_THRESHOLD 40)
add_tile_display_tests("pvcs-tile-display" 2 1
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/TileDisplay3DTesting-2x1.xml)
set (TileDisplay3DTesting-2x2_THRESHOLD 40)
add_tile_display_tests("pvcs-tile-display" 2 2
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/TileDisplay3DTesting-2x2.xml)
#------------------------------------------------------------------
# Add tests that test command line arguments (among other things).
#------------------------------------------------------------------
if (PARAVIEW_DATA_ROOT AND TARGET paraview)
# The state file need to point to the correct data file. We do that by
# configuring the state file.
configure_file (
"${CMAKE_CURRENT_SOURCE_DIR}/exodusStateFile.3.14.1.pvsm.in"
"${CMAKE_CURRENT_BINARY_DIR}/exodusStateFile.3.14.1.pvsm" @ONLY)
add_pv_test("pv" "_DISABLE_C"
COMMAND --client $<TARGET_FILE:paraview>
--enable-bt
-dr
--test-directory=${PARAVIEW_TEST_DIR}
--state=${CMAKE_CURRENT_BINARY_DIR}/exodusStateFile.3.14.1.pvsm
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/LoadExodusStateFile.xml)
endif()
ENDIF (PARAVIEW_DATA_ROOT)
TEST_SCRIPTS ${CMAKE_CURRENT_SOURCE_DIR}/LoadExodusStateFile.xml)
endif()
......@@ -6,7 +6,7 @@ set(EYE_DOME_LIGHTING_TESTS
set (EyeDomeLighting_BREAK TRUE)
IF (PARAVIEW_DATA_ROOT AND PARAVIEW_BUILD_QT_GUI AND BUILD_SHARED_LIBS)
IF (PARAVIEW_BUILD_QT_GUI AND BUILD_SHARED_LIBS)
add_client_tests("pv"
LOAD_PLUGIN "EyeDomeLightingView"
......
......@@ -12,7 +12,7 @@ SET(GMV_READER_TESTS
SET(GMVReaderBasicRead${_SUFFIX}_BREAK TRUE)
SET(GMVReaderInvalidFiles${_SUFFIX}_BREAK TRUE)
IF (PARAVIEW_DATA_ROOT AND PARAVIEW_BUILD_QT_GUI)
IF (PARAVIEW_BUILD_QT_GUI)
add_client_tests("pv"
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${GMV_READER_TESTS}
......
if(PARAVIEW_DATA_ROOT AND PARAVIEW_BUILD_QT_GUI)
if(PARAVIEW_BUILD_QT_GUI)
include(ParaViewTestingMacros)
......
include(ParaViewTestingMacros)
if (PARAVIEW_DATA_ROOT AND PARAVIEW_BUILD_QT_GUI AND BUILD_SHARED_LIBS)
if (PARAVIEW_BUILD_QT_GUI AND BUILD_SHARED_LIBS)
add_client_tests("pv"
LOAD_PLUGIN "MantaView"
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
......
......@@ -8,7 +8,7 @@ set(MULTI_SLICE_TESTS
set(QuadViewSliceMultiBlock_BREAK TRUE)
set(QuadViewSliceWavelet_BREAK TRUE)
IF (PARAVIEW_DATA_ROOT AND PARAVIEW_BUILD_QT_GUI)
IF (PARAVIEW_BUILD_QT_GUI)
add_client_tests("pv"
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
TEST_SCRIPTS ${MULTI_SLICE_TESTS}
......
......@@ -19,7 +19,6 @@ add_paraview_plugin(StreamingParticles "1.0"
if(PARAVIEW_ENABLE_COSMOTOOLS
AND BUILD_TESTING
AND PARAVIEW_DATA_ROOT
AND PARAVIEW_BUILD_QT_GUI)
include(ParaViewTestingMacros)
paraview_test_load_data_dirs(StreamingParticles
......
......@@ -85,7 +85,7 @@ ADD_PARAVIEW_PLUGIN(
tp_export_py.cxx
)
IF (BUILD_TESTING AND BUILD_SHARED_LIBS AND PARAVIEW_DATA_ROOT)
IF (BUILD_TESTING AND BUILD_SHARED_LIBS)
include(ParaViewTestingMacros)
add_client_tests("pv"
LOAD_PLUGIN "TemporalParallelismScriptGenerator"
......
......@@ -4,7 +4,7 @@ set(UNCERTAINTY_RENDERING_TESTS
${CMAKE_CURRENT_SOURCE_DIR}/UncertaintyRendering.xml
)
if(PARAVIEW_DATA_ROOT AND PARAVIEW_BUILD_QT_GUI AND BUILD_SHARED_LIBS)
if(PARAVIEW_BUILD_QT_GUI AND BUILD_SHARED_LIBS)
add_client_tests("pv"
LOAD_PLUGIN "UncertaintyRendering"
BASELINE_DIR ${PARAVIEW_TEST_BASELINE_DIR}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment