From 9741bbb9051e12f8bcea601a7c3f92515ab381bf Mon Sep 17 00:00:00 2001 From: nadavi Date: Wed, 4 Nov 2020 17:33:00 +0000 Subject: [PATCH] Update Images and exclude RegressionTest from ctest_memcheck on centos8 builds --- .gitlab/ci/centos8.yml | 1 + .gitlab/ci/ctest_memcheck.cmake | 3 ++- data/baseline/point-transform.png | 3 +++ data/baseline/point-transform0.png | 3 --- data/baseline/point-transform1.png | 3 --- data/baseline/split-sharp-edges.png | 4 ++-- data/baseline/streamline.png | 3 +++ data/baseline/streamline0.png | 3 --- data/baseline/streamline1.png | 3 --- data/baseline/surface-normals.png | 3 +++ data/baseline/surface-normals0.png | 3 --- data/baseline/surface-normals1.png | 3 --- vtkm/filter/testing/RegressionTestPointTransform.cxx | 5 ++--- vtkm/filter/testing/RegressionTestSplitSharpEdges.cxx | 2 +- vtkm/filter/testing/RegressionTestStreamline.cxx | 5 ++--- vtkm/filter/testing/RegressionTestSurfaceNormals.cxx | 5 ++--- 16 files changed, 21 insertions(+), 31 deletions(-) create mode 100644 data/baseline/point-transform.png delete mode 100644 data/baseline/point-transform0.png delete mode 100644 data/baseline/point-transform1.png create mode 100644 data/baseline/streamline.png delete mode 100644 data/baseline/streamline0.png delete mode 100644 data/baseline/streamline1.png create mode 100644 data/baseline/surface-normals.png delete mode 100644 data/baseline/surface-normals0.png delete mode 100644 data/baseline/surface-normals1.png diff --git a/.gitlab/ci/centos8.yml b/.gitlab/ci/centos8.yml index 7319217cf..7b799b431 100644 --- a/.gitlab/ci/centos8.yml +++ b/.gitlab/ci/centos8.yml @@ -30,6 +30,7 @@ test:centos8_sanitizer: variables: OMP_NUM_THREADS: 4 CTEST_MEMORYCHECK_TYPE: LeakSanitizer + CTEST_EXCLUSIONS: "RegressionTest.*" dependencies: - build:centos8_sanitizer needs: diff --git a/.gitlab/ci/ctest_memcheck.cmake b/.gitlab/ci/ctest_memcheck.cmake index abf80a34c..5032b711c 100644 --- a/.gitlab/ci/ctest_memcheck.cmake +++ b/.gitlab/ci/ctest_memcheck.cmake @@ -33,7 +33,8 @@ if(NOT CTEST_MEMORYCHECK_SUPPRESSIONS_FILE) endif() set(test_exclusions - # placeholder for tests to exclude + # placeholder for tests to exclude provided by the env + $ENV{CTEST_EXCLUSIONS} ) string(REPLACE ";" "|" test_exclusions "${test_exclusions}") diff --git a/data/baseline/point-transform.png b/data/baseline/point-transform.png new file mode 100644 index 000000000..521a8b654 --- /dev/null +++ b/data/baseline/point-transform.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:573927195d4a2dbcc5f92b9f443dcdeaa30b0e27c77da3563bf91064b6d037ad +size 31339 diff --git a/data/baseline/point-transform0.png b/data/baseline/point-transform0.png deleted file mode 100644 index 9d6db4e0a..000000000 --- a/data/baseline/point-transform0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:ecc4a2516f424dcd5a553846854089e7f5c3718d8422cefefc659f6073f028cc -size 28258 diff --git a/data/baseline/point-transform1.png b/data/baseline/point-transform1.png deleted file mode 100644 index 748f8260a..000000000 --- a/data/baseline/point-transform1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:f369086fb38f92d4b0074af566872ce3876d65df8e2bc5fb0757c57a7449522f -size 28255 diff --git a/data/baseline/split-sharp-edges.png b/data/baseline/split-sharp-edges.png index 0b2865224..de8b23cf8 100644 --- a/data/baseline/split-sharp-edges.png +++ b/data/baseline/split-sharp-edges.png @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:72f636178dccba9b039147c0ec674d3d717d44057dbc385ac9eb7e510df384b1 -size 64326 +oid sha256:db2f033837778828b54f398bbc9df180eb8da425cb29025c13e3930aa9c02da3 +size 71673 diff --git a/data/baseline/streamline.png b/data/baseline/streamline.png new file mode 100644 index 000000000..8753c4f47 --- /dev/null +++ b/data/baseline/streamline.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a20e53e0ed56502d9a821fcceef2c0b34e71d2a5748519fd55352c3824582675 +size 37150 diff --git a/data/baseline/streamline0.png b/data/baseline/streamline0.png deleted file mode 100644 index 957e7b2ee..000000000 --- a/data/baseline/streamline0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:15c1190696131735ab24cd3b5d57694cccab3a63e7ec61747781a4562ac0680c -size 31592 diff --git a/data/baseline/streamline1.png b/data/baseline/streamline1.png deleted file mode 100644 index 35c2a6f50..000000000 --- a/data/baseline/streamline1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:b215997c33dfb26d6a949af55b8161b63a83e48f8f11d4733551a215cf085e15 -size 31588 diff --git a/data/baseline/surface-normals.png b/data/baseline/surface-normals.png new file mode 100644 index 000000000..2c415f56d --- /dev/null +++ b/data/baseline/surface-normals.png @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a2147c3e30227d41dca5b6b18a1df6474ffe7f4fd6a72614979c5245299c973a +size 51846 diff --git a/data/baseline/surface-normals0.png b/data/baseline/surface-normals0.png deleted file mode 100644 index 9e4923e85..000000000 --- a/data/baseline/surface-normals0.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:34698f0f8e0895745208f4e9f608cbd4faca6cfb0b25a1a984b117a4f53eea38 -size 46680 diff --git a/data/baseline/surface-normals1.png b/data/baseline/surface-normals1.png deleted file mode 100644 index 18d9f960d..000000000 --- a/data/baseline/surface-normals1.png +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a16d182ccd5199a577d54386ab7f5f35c988848ef81bcb8d1f7001eb60b2e1a9 -size 46683 diff --git a/vtkm/filter/testing/RegressionTestPointTransform.cxx b/vtkm/filter/testing/RegressionTestPointTransform.cxx index e0a769856..3a2aa2676 100644 --- a/vtkm/filter/testing/RegressionTestPointTransform.cxx +++ b/vtkm/filter/testing/RegressionTestPointTransform.cxx @@ -56,10 +56,9 @@ void TestPointTransform() M mapper; vtkm::rendering::Scene scene; auto view = vtkm::rendering::testing::GetViewPtr( - result, "pointvar", canvas, mapper, scene, colorTable, static_cast(0.05)); + result, "pointvar", canvas, mapper, scene, colorTable, static_cast(0.0)); - VTKM_TEST_ASSERT( - vtkm::rendering::testing::test_equal_images_matching_name(view, "point-transform.png")); + VTKM_TEST_ASSERT(vtkm::rendering::testing::test_equal_images(view, "point-transform.png")); } } // namespace diff --git a/vtkm/filter/testing/RegressionTestSplitSharpEdges.cxx b/vtkm/filter/testing/RegressionTestSplitSharpEdges.cxx index 741e6e798..c512ab6a2 100644 --- a/vtkm/filter/testing/RegressionTestSplitSharpEdges.cxx +++ b/vtkm/filter/testing/RegressionTestSplitSharpEdges.cxx @@ -49,7 +49,7 @@ void TestSplitSharpEdges() M mapper; vtkm::rendering::Scene scene; auto view = vtkm::rendering::testing::GetViewPtr( - result, "pointvar", canvas, mapper, scene, colorTable, static_cast(0.05)); + result, "pointvar", canvas, mapper, scene, colorTable, static_cast(0.0)); VTKM_TEST_ASSERT(vtkm::rendering::testing::test_equal_images(view, "split-sharp-edges.png")); } diff --git a/vtkm/filter/testing/RegressionTestStreamline.cxx b/vtkm/filter/testing/RegressionTestStreamline.cxx index efe75f4ba..4147ad286 100644 --- a/vtkm/filter/testing/RegressionTestStreamline.cxx +++ b/vtkm/filter/testing/RegressionTestStreamline.cxx @@ -72,10 +72,9 @@ void TestStreamline() M mapper; vtkm::rendering::Scene scene; auto view = vtkm::rendering::testing::GetViewPtr( - result, "pointvar", canvas, mapper, scene, colorTable, static_cast(0.1)); + result, "pointvar", canvas, mapper, scene, colorTable, static_cast(0.0)); - VTKM_TEST_ASSERT( - vtkm::rendering::testing::test_equal_images_matching_name(view, "streamline.png")); + VTKM_TEST_ASSERT(vtkm::rendering::testing::test_equal_images(view, "streamline.png")); } } // namespace diff --git a/vtkm/filter/testing/RegressionTestSurfaceNormals.cxx b/vtkm/filter/testing/RegressionTestSurfaceNormals.cxx index d981d9add..1c0e226bd 100644 --- a/vtkm/filter/testing/RegressionTestSurfaceNormals.cxx +++ b/vtkm/filter/testing/RegressionTestSurfaceNormals.cxx @@ -51,10 +51,9 @@ void TestSurfaceNormals() M mapper; vtkm::rendering::Scene scene; auto view = vtkm::rendering::testing::GetViewPtr( - result, "pointvar", canvas, mapper, scene, colorTable, static_cast(0.05)); + result, "pointvar", canvas, mapper, scene, colorTable, static_cast(0.0)); - VTKM_TEST_ASSERT( - vtkm::rendering::testing::test_equal_images_matching_name(view, "surface-normals.png")); + VTKM_TEST_ASSERT(vtkm::rendering::testing::test_equal_images(view, "surface-normals.png")); } } // namespace