Define VTK_TEST_OUTPUT_DIR to name Testing/Temporary directory

Replace all references to ${VTK_BINARY_DIR}/Testing/Temporary with
${VTK_TEST_OUTPUT_DIR} and set the variable accordingly.  The latter is
shorter and will also be useful to build module tests as an external
application that does not have VTK_BINARY_DIR available.

Change-Id: I5159077c10dd2eab23365e9ac917bc6cbd806589

CMakeLists.txt

@@ -17,6 +17,9 @@ if(NOT CMAKE_BUILD_TYPE AND NOT CMAKE_CONFIGURATION_TYPES)
     "MinSizeRel" "RelWithDebInfo")
 endif()
 
+# Test output directory.
+set(VTK_TEST_OUTPUT_DIR "${VTK_BINARY_DIR}/Testing/Temporary")
+
 # Set up our directory structure for output libraries and binaries
 if(NOT CMAKE_RUNTIME_OUTPUT_DIRECTORY)
   set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${VTK_BINARY_DIR}/bin"

Charts/Core/Testing/Cxx/CMakeLists.txt

@@ -71,7 +71,7 @@
       add_test(NAME Charts-${TName}
         COMMAND ${vtk-module}CxxTests ${TName}
           -D ${VTK_DATA_ROOT}
-          -T ${VTK_BINARY_DIR}/Testing/Temporary
+          -T ${VTK_TEST_OUTPUT_DIR}
           -V Baseline/Charts/${TName}.png
           -E ${_error_threshold})
     else()

Chemistry/Core/Testing/Cxx/CMakeLists.txt

@@ -42,7 +42,7 @@ foreach(test ${TestsToRun})
     add_test(NAME Chemistry-${TName}
       COMMAND ${vtk-module}CxxTests ${TName}
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Chemistry/${TName}.png
         -E ${_error_threshold})
   else()

Common/ComputationalGeometry/Testing/Tcl/CMakeLists.txt

@@ -12,7 +12,7 @@ if (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl
         ${vtkCommonComputationalGeometry_SOURCE_DIR}/Testing/Tcl/${tfile}.tcl
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Filtering/${tfile}.png
         -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
     endforeach()
@@ -21,7 +21,7 @@ if (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl
         ${VTK_SOURCE_DIR}/Filtering/Testing/Tcl/squadViewer.tcl
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Filtering/squadViewer.png
         -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
     endif()

Common/DataModel/Testing/Tcl/CMakeLists.txt

@@ -13,7 +13,7 @@ if (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl
         ${vtkCommonDataModel_SOURCE_DIR}/Testing/Tcl/${tfile}.tcl
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Filtering/${tfile}.png
         -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
     endforeach()
@@ -22,7 +22,7 @@ if (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl
         ${VTK_SOURCE_DIR}/Filtering/Testing/Tcl/squadViewer.tcl
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Filtering/squadViewer.png
         -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
     endif()

Common/ExecutionModel/Testing/Cxx/CMakeLists.txt

@@ -19,12 +19,12 @@ foreach (test ${TestsToRun})
   add_test(NAME ${TName}
     COMMAND ${vtk-module}CxxTests ${TName}
       -D ${VTK_DATA_ROOT}
-      -T ${VTK_BINARY_DIR}/Testing/Temporary
+      -T ${VTK_TEST_OUTPUT_DIR}
       -V Baseline/${vtk-module}/${TName}.png)
   else()
   add_test(NAME ${TName}
     COMMAND ${vtk-module}CxxTests ${TName}
-      -T ${VTK_BINARY_DIR}/Testing/Temporary
+      -T ${VTK_TEST_OUTPUT_DIR}
       )
   endif()
 endforeach()

Examples/IO/Cxx/CMakeLists.txt

@@ -26,7 +26,7 @@ IF (VTK_DATA_ROOT)
 ADD_TEST(${KIT}-ParticleReader ${EXECUTABLE_OUTPUT_PATH}/${KIT}CxxTests
          TestParticleReader
            ${VTK_DATA_ROOT}/Data/golf.csv
-           ${VTK_BINARY_DIR}/Testing/Temporary/TestParticleReader.vtp)
+           ${VTK_TEST_OUTPUT_DIR}/TestParticleReader.vtp)
 ADD_TEST(${KIT}-DumpXMLFile ${EXECUTABLE_OUTPUT_PATH}/${KIT}CxxTests
          TestDumpXMLFile
            ${VTK_DATA_ROOT}/Data/cow.vtp)

Examples/Modelling/Cxx/CMakeLists.txt

@@ -33,9 +33,9 @@ ADD_TEST(${KIT}-Finance ${EXECUTABLE_OUTPUT_PATH}/${KIT}CxxTests
 ADD_TEST(${KIT}-Delaunay3D ${EXECUTABLE_OUTPUT_PATH}/${KIT}CxxTests
          TestDelaunay3D
            ${VTK_DATA_ROOT}/Data/cow.vtp
-           ${VTK_BINARY_DIR}/Testing/Temporary/Delaunay3D.vtu)
+           ${VTK_TEST_OUTPUT_DIR}/Delaunay3D.vtu)
 ADD_TEST(${KIT}-Delaunay3DAlpa ${EXECUTABLE_OUTPUT_PATH}/${KIT}CxxTests
          TestDelaunay3DAlpha
            .5 ${VTK_DATA_ROOT}/Data/cow.vtp
-           ${VTK_BINARY_DIR}/Testing/Temporary/Delaunay3DAlpha.vtu)
+           ${VTK_TEST_OUTPUT_DIR}/Delaunay3DAlpha.vtu)
 ENDIF (VTK_DATA_ROOT)

Filters/Core/Testing/Cxx/CMakeLists.txt

@@ -25,7 +25,7 @@ foreach(test ${TestsToRun})
     add_test(NAME ${vtk-module}Cxx-${TName}
       COMMAND ${vtk-module}CxxTests ${TName}
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Graphics/${TName}.png)
   else()
     add_test(NAME ${vtk-module}Cxx-${TName}

Filters/Extraction/Testing/Cxx/CMakeLists.txt

@@ -17,7 +17,7 @@ foreach(test ${TestsToRun})
     add_test(NAME ${vtk-module}Cxx-${TName}
       COMMAND ${vtk-module}CxxTests ${TName}
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Graphics/${TName}.png)
   else()
     add_test(NAME ${vtk-module}Cxx-${TName}

Filters/General/Testing/Cxx/CMakeLists.txt

@@ -36,12 +36,12 @@ foreach (test ${TestsToRun})
   add_test(NAME ${vtk-module}Cxx-${TName}
     COMMAND ${vtk-module}CxxTests ${TName}
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Graphics/${TName}.png)
   else()
   add_test(NAME ${vtk-module}Cxx-${TName}
     COMMAND ${vtk-module}CxxTests ${TName}
-      -T ${VTK_BINARY_DIR}/Testing/Temporary
+      -T ${VTK_TEST_OUTPUT_DIR}
       )
   endif()
 endforeach()

Filters/Geometry/Testing/Cxx/CMakeLists.txt

@@ -23,7 +23,7 @@ foreach(test ${TestsToRun})
     add_test(NAME ${vtk-module}Cxx-${TName}
       COMMAND ${vtk-module}CxxTests ${TName}
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Graphics/${TName}.png)
   else()
     add_test(NAME ${vtk-module}Cxx-${TName}

Filters/Hybrid/Testing/Cxx/CMakeLists.txt

@@ -13,6 +13,6 @@ if(VTK_DATA_ROOT)
     COMMAND ${vtk-module}CxxTests TestPolyDataSilhouette
       ${VTK_DATA_ROOT}/Data/cow.vtp
       -D ${VTK_DATA_ROOT}
-      -T ${VTK_BINARY_DIR}/Testing/Temporary
+      -T ${VTK_TEST_OUTPUT_DIR}
       -V Baseline/Hybrid/TestPolyDataSilhouette.png)
 endif()

Filters/HyperOctree/Testing/Cxx/CMakeLists.txt

@@ -21,7 +21,7 @@ foreach(test ${TestsToRun})
     add_test(NAME ${vtk-module}Cxx-${TName}
       COMMAND ${vtk-module}CxxTests ${TName}
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Graphics/${TName}.png)
   else()
     add_test(NAME ${vtk-module}Cxx-${TName}

Filters/Modeling/Testing/Cxx/CMakeLists.txt

@@ -20,7 +20,7 @@ foreach(test ${TestsToRun})
     add_test(NAME ${vtk-module}Cxx-${TName}
       COMMAND ${vtk-module}CxxTests ${TName}
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Graphics/${TName}.png)
   else()
     add_test(NAME ${vtk-module}Cxx-${TName}

Filters/Sources/Testing/Cxx/CMakeLists.txt

@@ -17,7 +17,7 @@ foreach(test ${TestsToRun})
     add_test(NAME ${vtk-module}Cxx-${TName}
       COMMAND ${vtk-module}CxxTests ${TName}
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/${vtk-module}/${TName}.png)
   else()
     add_test(NAME ${vtk-module}Cxx-${TName}

Filters/Sources/Testing/Tcl/CMakeLists.txt

@@ -10,7 +10,7 @@ if (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl
         ${vtkFiltersSources_SOURCE_DIR}/Testing/Tcl/${tfile}.tcl
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Filtering/${tfile}.png
         -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
     endforeach()
@@ -19,7 +19,7 @@ if (VTK_USE_RENDERING AND VTK_USE_DISPLAY)
         ${VTK_SOURCE_DIR}/Common/Testing/Tcl/rtImageTest.tcl
         ${VTK_SOURCE_DIR}/Filtering/Testing/Tcl/squadViewer.tcl
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Filtering/squadViewer.png
         -A ${VTK_SOURCE_DIR}/Wrapping/Tcl)
     endif()

Filters/Statistics/Testing/Cxx/CMakeLists.txt

@@ -17,7 +17,7 @@ foreach(test ${TestsToRun})
     add_test(NAME ${vtk-module}Cxx-${TName}
       COMMAND ${vtk-module}CxxTests ${TName}
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/${vtk-module}/${TName}.png)
   else()
     add_test(NAME ${vtk-module}Cxx-${TName}

Filters/Tracers/Testing/Cxx/CMakeLists.txt

@@ -16,12 +16,12 @@ foreach (test ${TestsToRun})
   add_test(NAME ${vtk-module}Cxx-${TName}
     COMMAND ${vtk-module}CxxTests ${TName}
         -D ${VTK_DATA_ROOT}
-        -T ${VTK_BINARY_DIR}/Testing/Temporary
+        -T ${VTK_TEST_OUTPUT_DIR}
         -V Baseline/Graphics/${TName}.png)
   else()
   add_test(NAME ${vtk-module}Cxx-${TName}
     COMMAND ${vtk-module}CxxTests ${TName}
-      -T ${VTK_BINARY_DIR}/Testing/Temporary
+      -T ${VTK_TEST_OUTPUT_DIR}
       )
   endif()
 endforeach()

Filters/Verdict/Testing/Cxx/CMakeLists.txt

@@ -15,7 +15,7 @@ foreach(test ${TestsToRun})
     add_test(NAME ${vtk-module}Cxx-${TName}
             COMMAND ${vtk-module}CxxTests ${TName}
                                           -D ${VTK_DATA_ROOT}
-                                          -T ${VTK_BINARY_DIR}/Testing/Temporary
+                                          -T ${VTK_TEST_OUTPUT_DIR}
                                           -V Baseline/${vtk-module}/${TName}.png)
   else()
     add_test(NAME ${vtk-module}Cxx-${TName} COMMAND ${vtk-module}CxxTests ${TName})