Ignore whitespace for diff comparisons

ornladios · Sep 20, 2019 · dea44a5 · dea44a5
1 parent fe77305
commit dea44a5
Show file tree

Hide file tree

Showing 18 changed files with 36 additions and 36 deletions.
diff --git a/testing/adios2/engine/skeleton/CMakeLists.txt b/testing/adios2/engine/skeleton/CMakeLists.txt
@@ -29,14 +29,14 @@ add_test(NAME Engine.Skeleton.Reader
 SetupTestPipeline(Engine.Skeleton "Writer;Reader" TRUE)
 
 add_test(NAME Engine.Skeleton.Writer.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/TestSkeletonWriterExpectedOutput.txt
     TestSkeletonWriterOutput.txt
 )
 SetupTestPipeline(Engine.Skeleton "Writer;Writer.Validate" FALSE)
 
 add_test(NAME Engine.Skeleton.Reader.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/TestSkeletonReaderExpectedOutput.txt
     TestSkeletonReaderOutput.txt
 )

diff --git a/testing/examples/heatTransfer/TestBPFileMx1.cmake b/testing/examples/heatTransfer/TestBPFileMx1.cmake
@@ -31,7 +31,7 @@ add_test(NAME HeatTransfer.BP3.Mx1.Dump
 )
 
 add_test(NAME HeatTransfer.BP3.Mx1.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
@@ -66,7 +66,7 @@ add_test(NAME HeatTransfer.BP4.Mx1.Dump
 )
 
 add_test(NAME HeatTransfer.BP4.Mx1.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/examples/heatTransfer/TestBPFileMxM.cmake b/testing/examples/heatTransfer/TestBPFileMxM.cmake
@@ -33,7 +33,7 @@ add_test(NAME HeatTransfer.BP3.MxM.Dump
 )
 
 add_test(NAME HeatTransfer.BP3.MxM.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
@@ -68,7 +68,7 @@ add_test(NAME HeatTransfer.BP4.MxM.Dump
 )
 
 add_test(NAME HeatTransfer.BP4.MxM.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/examples/heatTransfer/TestBPFileMxN.cmake b/testing/examples/heatTransfer/TestBPFileMxN.cmake
@@ -33,7 +33,7 @@ add_test(NAME HeatTransfer.BP3.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.BP3.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )
@@ -68,7 +68,7 @@ add_test(NAME HeatTransfer.BP4.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.BP4.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/examples/heatTransfer/TestInsituMPIMx1.cmake b/testing/examples/heatTransfer/TestInsituMPIMx1.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.InsituMPI.Mx1.Dump
 )
 
 add_test(NAME HeatTransfer.InsituMPI.Mx1.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/examples/heatTransfer/TestInsituMPIMxM.cmake b/testing/examples/heatTransfer/TestInsituMPIMxM.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.InsituMPI.MxM.Dump
 )
 
 add_test(NAME HeatTransfer.InsituMPI.MxM.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/examples/heatTransfer/TestInsituMPIMxN.cmake b/testing/examples/heatTransfer/TestInsituMPIMxN.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.InsituMPI.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.InsituMPI.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/examples/heatTransfer/TestSSTBPMx1.cmake b/testing/examples/heatTransfer/TestSSTBPMx1.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.BP.Mx1.Dump
 )
 
 add_test(NAME HeatTransfer.SST.BP.Mx1.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/examples/heatTransfer/TestSSTBPMxM.cmake b/testing/examples/heatTransfer/TestSSTBPMxM.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.BP.MxM.Dump
 )
 
 add_test(NAME HeatTransfer.SST.BP.MxM.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/examples/heatTransfer/TestSSTBPMxN.cmake b/testing/examples/heatTransfer/TestSSTBPMxN.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.BP.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.SST.BP.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/examples/heatTransfer/TestSSTBPRDMAMxN.cmake b/testing/examples/heatTransfer/TestSSTBPRDMAMxN.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.BP.RDMA.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.SST.BP.RDMA.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/examples/heatTransfer/TestSSTFFSMx1.cmake b/testing/examples/heatTransfer/TestSSTFFSMx1.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.FFS.Mx1.Dump
 )
 
 add_test(NAME HeatTransfer.SST.FFS.Mx1.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/examples/heatTransfer/TestSSTFFSMxM.cmake b/testing/examples/heatTransfer/TestSSTFFSMxM.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.FFS.MxM.Dump
 )
 
 add_test(NAME HeatTransfer.SST.FFS.MxM.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/examples/heatTransfer/TestSSTFFSMxN.cmake b/testing/examples/heatTransfer/TestSSTFFSMxN.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.FFS.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.SST.FFS.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/examples/heatTransfer/TestSSTFFSRDMAMxN.cmake b/testing/examples/heatTransfer/TestSSTFFSRDMAMxN.cmake
@@ -28,7 +28,7 @@ add_test(NAME HeatTransfer.SST.FFS.MxN.Dump
 )
 
 add_test(NAME HeatTransfer.SST.FFS.MxN.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/HeatTransfer.Dump.txt
     Dump.txt
 )

diff --git a/testing/utils/changingshape/CMakeLists.txt b/testing/utils/changingshape/CMakeLists.txt
@@ -39,7 +39,7 @@ add_test(NAME Utils.ChangingShape.Dump
 
 if(ADIOS2_HAVE_MPI)
   add_test(NAME Utils.ChangingShape.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsla.expected.txt
       TestUtilsChangingShape.bplsla.result.txt
   )
@@ -63,7 +63,7 @@ add_test(NAME Utils.ChangingShape.AlternatingStepsAndChangingShapeVar.Dump
 
 if(ADIOS2_HAVE_MPI)
   add_test(NAME Utils.ChangingShape.AlternatingStepsAndChangingShapeVar.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsldAlternatingStepsAndChangingShapeVar.expected.txt
       TestUtilsChangingShape.bplsldAlternatingStepsAndChangingShapeVar.result.txt
   )
@@ -97,7 +97,7 @@ add_test(NAME Utils.ChangingShape.AlternatingStepsVarSelection.Dump
 
 if(ADIOS2_HAVE_MPI)
   add_test(NAME Utils.ChangingShape.AlternatingStepsVarSelection.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsldAlternatingStepsVarSelection.expected.txt
       TestUtilsChangingShape.bplsldAlternatingStepsVarSelection.result.txt
   )
@@ -130,7 +130,7 @@ add_test(NAME Utils.ChangingShape.ChangingShapeVarOneStep.Dump
 )
 if(ADIOS2_HAVE_MPI)
   add_test(NAME Utils.ChangingShape.ChangingShapeVarOneStep.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsldChangingShapeVarOneStep.expected.txt
       TestUtilsChangingShape.bplsldChangingShapeVarOneStep.result.txt
   )
@@ -160,7 +160,7 @@ add_test(NAME Utils.ChangingShape.FixedShapeVarTooManySteps.Dump
 
 if(ADIOS2_HAVE_MPI)
   add_test(NAME Utils.ChangingShape.FixedShapeVarTooManySteps.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsChangingShape.bplsldFixedShapeVarTooManySteps.expected.txt
       TestUtilsChangingShape.bplsldFixedShapeVarTooManySteps.result.txt
   )

diff --git a/testing/utils/cwriter/CMakeLists.txt b/testing/utils/cwriter/CMakeLists.txt
@@ -33,7 +33,7 @@ add_test(NAME Utils.CWriter.Bpls.h.Dump
 
 if(ADIOS2_HAVE_MPI)
   add_test(NAME Utils.CWriter.Bpls.h.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsh.expected.txt
       TestUtilsCWriter.bplsh.result.txt
   )
@@ -64,7 +64,7 @@ add_test(NAME Utils.CWriter.Bpls.la.Dump
 
 if(ADIOS2_HAVE_MPI)
   add_test(NAME Utils.CWriter.Bpls.la.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsla.expected.txt
       TestUtilsCWriter.bplsla.result.txt
   )
@@ -89,7 +89,7 @@ add_test(NAME Utils.CWriter.Bpls.Al.Dump
 
 if(ADIOS2_HAVE_MPI)
   add_test(NAME Utils.CWriter.Bpls.Al.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsAl.expected.txt
       TestUtilsCWriter.bplsAl.result.txt
   )
@@ -111,7 +111,7 @@ add_test(NAME Utils.CWriter.Bpls.ldDav.Dump
 
 if(ADIOS2_HAVE_MPI)
   add_test(NAME Utils.CWriter.Bpls.ldDav.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsldDav.expected.txt
       TestUtilsCWriter.bplsldDav.result.txt
   )
@@ -134,7 +134,7 @@ add_test(NAME Utils.CWriter.Bpls.ldDavvv.Dump
 
 if(ADIOS2_HAVE_MPI)
   add_test(NAME Utils.CWriter.Bpls.ldDavvv.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsldDavvv.expected.txt
       TestUtilsCWriter.bplsldDavvv.result.txt
   )
@@ -162,7 +162,7 @@ add_test(NAME Utils.CWriter.Bpls.ldvarI16.Dump
 
 if(ADIOS2_HAVE_MPI)
   add_test(NAME Utils.CWriter.Bpls.ldvarI16.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/TestUtilsCWriter.bplsldvarI16.expected.txt
       TestUtilsCWriter.bplsldvarI16.result.txt
   )

diff --git a/testing/utils/iotest/CMakeLists.txt b/testing/utils/iotest/CMakeLists.txt
@@ -28,7 +28,7 @@ add_test(NAME Utils.IOTest.Pipe2.BP.Write.Dump
 )
 
 add_test(NAME Utils.IOTest.Pipe2.BP.Write.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.BP.Write.bpls.txt
     IOTest.Pipe2.BP.Write.bpls.txt
 )
@@ -59,7 +59,7 @@ add_test(NAME Utils.IOTest.Pipe2.BP.Read.Dump
 )
 
 add_test(NAME Utils.IOTest.Pipe2.BP.Read.Validate
-  COMMAND ${DIFF_EXECUTABLE} -u
+  COMMAND ${DIFF_EXECUTABLE} -uw
     ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.BP.Read.bpls.txt
     IOTest.Pipe2.BP.Read.bpls.txt
 )
@@ -91,7 +91,7 @@ if(ADIOS2_HAVE_HDF5)
   )
 
   add_test(NAME Utils.IOTest.Pipe2.HDF5.Write.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.HDF5.Write.bpls.txt
       IOTest.Pipe2.HDF5.Write.bpls.txt
   )
@@ -122,7 +122,7 @@ if(ADIOS2_HAVE_HDF5)
   )
 
   add_test(NAME Utils.IOTest.Pipe2.HDF5.Read.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.HDF5.Read.bpls.txt
       IOTest.Pipe2.HDF5.Read.bpls.txt
   )
@@ -161,7 +161,7 @@ if(MPIEXEC_MAX_NUMPROCS GREATER 1)
   )
 
   add_test(NAME Utils.IOTest.Pipe2.InSituMPI.Validate
-    COMMAND ${DIFF_EXECUTABLE} -u
+    COMMAND ${DIFF_EXECUTABLE} -uw
       ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.InSituMPI.bpls.txt
       IOTest.Pipe2.InSituMPI.bpls.txt
   )
@@ -196,7 +196,7 @@ if(MPIEXEC_MAX_NUMPROCS GREATER 1)
     )
 
     add_test(NAME Utils.IOTest.Pipe2.SST.Validate
-      COMMAND ${DIFF_EXECUTABLE} -u
+      COMMAND ${DIFF_EXECUTABLE} -uw
         ${CMAKE_CURRENT_SOURCE_DIR}/IOTest.Pipe2.SST.bpls.txt
         IOTest.Pipe2.SST.bpls.txt
     )