From 564c83c03be25d5462e57158df63b8e98d97be3c Mon Sep 17 00:00:00 2001
From: Brad King <brad.king@kitware.com>
Date: Mon, 6 Feb 2012 11:52:59 -0500
Subject: [PATCH] Avoid /./ in mpi test executable path
In commit 5b9cbfd0 (Fix mpi test executable path for Makefile
generators, 2010-12-21) we replaced use of ${CTEST_CONFIGURATION_TYPE}
with just "." for single-configuration generators. That leads to paths
ending in "bin/./pvtk" which confuses the Tcl interpreter search path
rendering it unable to load the vtk Tcl package. TestPProbe-image fails
as a result.
Instead append /${CTEST_CONFIGURATION_TYPE} to the path for multi-config
generators and nothing for single-config generators.
Change-Id: I60d993617f17a5c6a92948040757182aae5a32d7
---
CMakeLists.txt | 4 +--
Infovis/Testing/Cxx/CMakeLists.txt | 10 ++++----
Parallel/Testing/Cxx/CMakeLists.txt | 38 ++++++++++++++---------------
Parallel/Testing/Tcl/CMakeLists.txt | 2 +-
4 files changed, 27 insertions(+), 27 deletions(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
index c15f07e9a45..14f887226a8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -204,9 +204,9 @@ ENDIF("${CMAKE_CFG_INTDIR}" STREQUAL ".")
# Where the cxx tests are, for use in ADD_TEST
SET(CXX_TEST_PATH ${EXECUTABLE_OUTPUT_PATH})
IF(CMAKE_CONFIGURATION_TYPES)
- SET(CXX_TEST_CONFIG \${CTEST_CONFIGURATION_TYPE})
+ SET(CXX_TEST_CONFIG /\${CTEST_CONFIGURATION_TYPE})
ELSE()
- SET(CXX_TEST_CONFIG .)
+ SET(CXX_TEST_CONFIG "")
ENDIF()
#-----------------------------------------------------------------------------
diff --git a/Infovis/Testing/Cxx/CMakeLists.txt b/Infovis/Testing/Cxx/CMakeLists.txt
index 417fad35658..be5aadbe280 100644
--- a/Infovis/Testing/Cxx/CMakeLists.txt
+++ b/Infovis/Testing/Cxx/CMakeLists.txt
@@ -103,7 +103,7 @@ IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
ADD_TEST(TestPBGLAlgorithms
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestPBGLAlgorithms
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestPBGLAlgorithms
${VTK_MPI_POSTFLAGS})
ENDIF (VTK_USE_PARALLEL_BGL)
ENDIF (VTK_USE_BOOST)
@@ -149,28 +149,28 @@ IF (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
ADD_TEST(TestRandomPMomentStatisticsMPI
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestRandomPMomentStatisticsMPI
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestRandomPMomentStatisticsMPI
${VTK_MPI_POSTFLAGS}
)
ADD_TEST(TestRandomPContingencyStatisticsMPI
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestRandomPContingencyStatisticsMPI
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestRandomPContingencyStatisticsMPI
${VTK_MPI_POSTFLAGS}
)
ADD_TEST(TestRandomPOrderStatisticsMPI
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestRandomPOrderStatisticsMPI
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestRandomPOrderStatisticsMPI
${VTK_MPI_POSTFLAGS}
)
ADD_TEST(TestRandomPKMeansStatisticsMPI
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestRandomPKMeansStatisticsMPI
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestRandomPKMeansStatisticsMPI
${VTK_MPI_POSTFLAGS}
)
ENDIF (VTK_MPIRUN_EXE)
diff --git a/Parallel/Testing/Cxx/CMakeLists.txt b/Parallel/Testing/Cxx/CMakeLists.txt
index 495706bdded..156f7bcf28d 100644
--- a/Parallel/Testing/Cxx/CMakeLists.txt
+++ b/Parallel/Testing/Cxx/CMakeLists.txt
@@ -134,12 +134,12 @@ IF(VTK_USE_DISPLAY AND VTK_USE_RENDERING)
ADD_TEST(MPIController
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} ${VTK_MPI_MAX_NUMPROCS}
${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestMPIController
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestMPIController
${VTK_MPI_POSTFLAGS}
)
ADD_TEST(TestProcess
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestProcess
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestProcess
${VTK_MPI_POSTFLAGS})
@@ -155,7 +155,7 @@ IF(VTK_USE_DISPLAY AND VTK_USE_RENDERING)
# I vote we just get rid of it altogether.
ADD_TEST(GenericCommunicator-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/GenericCommunicator
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/GenericCommunicator
${VTK_MPI_POSTFLAGS})
IF (VTK_USE_PARALLEL_BGL)
@@ -278,56 +278,56 @@ IF(VTK_USE_DISPLAY AND VTK_USE_RENDERING)
IF(VTK_MPI_MAX_NUMPROCS GREATER 1)
ADD_TEST(ParallelIso-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/ParallelIsoTest
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/ParallelIsoTest
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Parallel/ParallelIso.cxx.png
${VTK_MPI_POSTFLAGS})
ADD_TEST(TestPStream-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestPStream
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestPStream
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Parallel/TestPStream.cxx.png
${VTK_MPI_POSTFLAGS})
ADD_TEST(DistributedData-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/DistributedData
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/DistributedData
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Parallel/DistributedData.cxx.png
${VTK_MPI_POSTFLAGS})
ADD_TEST(DistributedDataRenderPass-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/DistributedDataRenderPass
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/DistributedDataRenderPass
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Parallel/DistributedDataRenderPass.cxx.png
${VTK_MPI_POSTFLAGS})
ADD_TEST(TransmitImageData-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TransmitImageData
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TransmitImageData
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Parallel/TransmitImageData.cxx.png
${VTK_MPI_POSTFLAGS})
ADD_TEST(TransmitImageDataRenderPass-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TransmitImageDataRenderPass
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TransmitImageDataRenderPass
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Parallel/TransmitImageDataRenderPass.cxx.png
${VTK_MPI_POSTFLAGS})
ADD_TEST(TestPShadowMapPass-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestPShadowMapPass
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestPShadowMapPass
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Parallel/TestPShadowMapPass.cxx.png
${VTK_MPI_POSTFLAGS})
ADD_TEST(TestDistributedDataShadowMapPass-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestDistributedDataShadowMapPass
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestDistributedDataShadowMapPass
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Parallel/TestDistributedDataShadowMapPass.cxx.png
@@ -335,7 +335,7 @@ IF(VTK_USE_DISPLAY AND VTK_USE_RENDERING)
ADD_TEST(TestPCompositeZPass-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestPCompositeZPass
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestPCompositeZPass
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Parallel/TestPCompositeZPass.cxx.png
@@ -343,7 +343,7 @@ IF(VTK_USE_DISPLAY AND VTK_USE_RENDERING)
ADD_TEST(TestDistributedDataCompositeZPass-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TestDistributedDataCompositeZPass
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TestDistributedDataCompositeZPass
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Parallel/TestDistributedDataCompositeZPass.cxx.png
@@ -351,14 +351,14 @@ IF(VTK_USE_DISPLAY AND VTK_USE_RENDERING)
ADD_TEST(TransmitRectilinearGrid-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TransmitRectilinearGrid
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TransmitRectilinearGrid
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V Baseline/Parallel/TransmitRectilinearGrid.cxx.png
${VTK_MPI_POSTFLAGS})
ADD_TEST(TransmitStructuredGrid-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/TransmitStructuredGrid
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/TransmitStructuredGrid
-D ${VTK_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Tempor2ary
-V Baseline/Parallel/TransmitStructuredGrid.cxx.png
@@ -383,28 +383,28 @@ IF(VTK_USE_DISPLAY AND VTK_USE_RENDERING)
IF (VTK_MPIRUN_EXE)
ADD_TEST(TestCommunicator
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/GenericCommunicator ${VTK_MPI_POSTFLAGS})
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/GenericCommunicator ${VTK_MPI_POSTFLAGS})
ENDIF(VTK_MPIRUN_EXE)
ENDIF (VTK_DATA_ROOT)
IF (VTK_LARGE_DATA_ROOT)
IF (VTK_MPIRUN_EXE)
ADD_TEST(PLSDynaReader
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/PLSDynaReader
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/PLSDynaReader
-D ${VTK_LARGE_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V ${VTK_LARGE_DATA_ROOT}/Baseline/Parallel/PLSDynaReader.png
${VTK_MPI_POSTFLAGS})
ADD_TEST(PSLACReaderLinear
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/PSLACReaderLinear
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/PSLACReaderLinear
-D ${VTK_LARGE_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V ${VTK_LARGE_DATA_ROOT}/Baseline/Parallel/PSLACReaderLinear.png
${VTK_MPI_POSTFLAGS})
ADD_TEST(PSLACReaderQuadratic
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/PSLACReaderQuadratic
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/PSLACReaderQuadratic
-D ${VTK_LARGE_DATA_ROOT}
-T ${VTK_BINARY_DIR}/Testing/Temporary
-V ${VTK_LARGE_DATA_ROOT}/Baseline/Parallel/PSLACReaderQuadratic.png
diff --git a/Parallel/Testing/Tcl/CMakeLists.txt b/Parallel/Testing/Tcl/CMakeLists.txt
index 3282525fb9e..d2d8c8e494a 100644
--- a/Parallel/Testing/Tcl/CMakeLists.txt
+++ b/Parallel/Testing/Tcl/CMakeLists.txt
@@ -80,7 +80,7 @@ IF (VTK_DATA_ROOT)
IF(PVTK_EXECUTABLE AND VTK_MPIRUN_EXE)
ADD_TEST(TestPProbe-image
${VTK_MPIRUN_EXE} ${VTK_MPI_PRENUMPROC_FLAGS} ${VTK_MPI_NUMPROC_FLAG} 2 ${VTK_MPI_PREFLAGS}
- ${CXX_TEST_PATH}/${CXX_TEST_CONFIG}/pvtk${CMAKE_EXECUTABLE_SUFFIX}
+ ${CXX_TEST_PATH}${CXX_TEST_CONFIG}/pvtk${CMAKE_EXECUTABLE_SUFFIX}
${VTK_SOURCE_DIR}/Common/Testing/Tcl/prtImageTest.tcl
${VTK_SOURCE_DIR}/Parallel/Testing/Tcl/TestPProbe.tcl
-D ${VTK_DATA_ROOT}
--
GitLab