vtkTestingMacros: Revert temporary data transform changes

Revert the parent and grandparent changes to vtk_add_test_* since they
were only for temporary use locally.

Change-Id: I9df6fd28f56717d560e26eb4705eb9c8c6413ca0

CMake/vtkTestingMacros.cmake

-macro(vtk_test_data_transform data_dir base_dir name)
-  set(module_base_dir ${${vtk-module}_SOURCE_DIR}/Testing/Data/Baseline)
-  set(in "${data_dir}/Baseline/${base_dir}/${name}.png")
-  file(GLOB in_ "${data_dir}/Baseline/${base_dir}/${name}_*.png")
-  file(REMOVE ${in} ${in_})
-endmacro()
-
 # -----------------------------------------------------------------------------
 # Usage: vtk_add_test_mpi(name [VTK_DATA_ROOT|VTK_LARGE_DATA_ROOT])
 macro (vtk_add_test_mpi name)
@@ -25,10 +18,9 @@ macro (vtk_add_test_mpi name)
   endforeach()
 
   if(data_dir)
-    vtk_test_data_transform("${data_dir}" Parallel "${TName}")
     set(_D -D ${data_dir})
     set(_T -T ${VTK_BINARY_DIR}/Testing/Temporary)
-    set(_V -V ${module_base_dir}/${TName}.png)
+    set(_V -V ${data_dir}/Baseline/Parallel/${TName}.png)
   else()
     set(_D "")
     set(_T "")
@@ -115,8 +107,7 @@ function(vtk_add_test_cxx)
       endif()
     endforeach()
     if(data_dir AND tmp_base)
-      vtk_test_data_transform("${data_dir}" "${tmp_base}" "${name}")
-      set(_V -V ${module_base_dir}/${name}.png)
+      set(_V -V Baseline/${tmp_base}/${name}.png)
     endif()
     add_test(NAME ${vtk-module}Cxx-${name}
       COMMAND ${vtk-module}CxxTests ${name} ${${name}_ARGS}
@@ -193,12 +184,11 @@ function(vtk_add_test_python name)
   set(_T "")
   set(_A "")
   if(VTK_DATA_ROOT AND base_dir)
-    vtk_test_data_transform("${VTK_DATA_ROOT}" "${base_dir}" "${TName}")
     if(no_rt)
-      set(_B -B ${module_base_dir})
+      set(_B -B ${VTK_DATA_ROOT}/Baseline/${base_dir})
     else()
       set(rtImageTest ${VTK_BINARY_DIR}/Utilities/vtkTclTest2Py/rtImageTest.py)
-      set(_V -V ${module_base_dir}/${TName}.png)
+      set(_V -V Baseline/${base_dir}/${TName}.png)
       set(_A -A ${VTK_BINARY_DIR}/Utilities/vtkTclTest2Py)
     endif()
     if(NOT no_output)
@@ -261,8 +251,7 @@ function(vtk_add_test_tcl name)
   if(NOT no_rt)
     set(rtImageTest ${vtkTestingRendering_SOURCE_DIR}/rtImageTest.tcl)
     if(VTK_DATA_ROOT AND base_dir)
-      vtk_test_data_transform("${VTK_DATA_ROOT}" "${base_dir}" "${TName}")
-      set(_V -V ${module_base_dir}/${TName}.png)
+      set(_V -V Baseline/${base_dir}/${TName}.png)
     endif()
     if(NOT no_output)
       set(_T -T ${VTK_TEST_OUTPUT_DIR})