remove testing pieces from CMake build

The existing test fragments in the CMake files had two undesirable effects:

  1. Projects using Graphviz as a subdirectory would pick up this test suite and
     it would get run as part of their own test suite. See #1795.

  2. The fragments incorrectly gave the impression this was the canonical set of
     Graphviz tests and/or that this is what was run in CI. The current reality
     is that CI ignores this path to a subset of the tests, and most of the
     maintainers do not run this either.

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 983dabe2adbb997d2ad24e2772c6340f1cb0fa8a..433f193c6b0357174329c0a6dd9a33ec1d3276ac 100644 (file)
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -15,6 +15,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Autotools build system support for eFence has been removed
 - Building Graphviz with ICC defaults to -O2 instead of -O0
 - Build system work arounds for GCC 3 have been removed
+- Incomplete support for running the test suite under CMake has been removed
 
 ### Fixed
 - gvpr: line numbers in gvpr errors/warnings are incorrect #1594

diff --git a/CMakeLists.txt b/CMakeLists.txt
index e42faae1de87d7fd98c9869178fb37536b3b8135..0a2e87e23104507d77ffb5d8626dd94b93406859 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -195,8 +195,6 @@ add_subdirectory(lib)
 add_subdirectory(plugin)
 add_subdirectory(cmd)
 
-enable_testing()
-add_subdirectory(tests)
 MATH(EXPR GRAPHVIZ_PLUGIN_VERSION "${GRAPHVIZ_PLUGIN_VERSION}+1")
 set(GVPLUGIN_VERSION "${GRAPHVIZ_PLUGIN_VERSION}")
 set(VERSION "${GRAPHVIZ_VERSION_STRING}")

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
deleted file mode 100644 (file)
index 83b7504..0000000
--- a/tests/CMakeLists.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-find_package(PythonInterp)
-
-if (PYTHONINTERP_FOUND)
-    add_subdirectory(regression_tests)
-else ()
-    message(WARNING "Python interperter not found, required for regression tests.")
-endif ()

diff --git a/tests/regression_tests/CMakeLists.txt b/tests/regression_tests/CMakeLists.txt
deleted file mode 100644 (file)
index c8f8dde..0000000
--- a/tests/regression_tests/CMakeLists.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-add_subdirectory(shapes)
-
-#### vuln tests cause appveyor build fails because reference is not the same for all os/dist - disabled
-# add_subdirectory(vuln)

diff --git a/tests/regression_tests/shapes/CMakeLists.txt b/tests/regression_tests/shapes/CMakeLists.txt
deleted file mode 100644 (file)
index 2aa1555..0000000
--- a/tests/regression_tests/shapes/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-add_test(
-    NAME shapes
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    COMMAND ${PYTHON_EXECUTABLE} shapes.py
-)

diff --git a/tests/regression_tests/vuln/CMakeLists.txt b/tests/regression_tests/vuln/CMakeLists.txt
deleted file mode 100644 (file)
index 7a6a1a0..0000000
--- a/tests/regression_tests/vuln/CMakeLists.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-add_test(
-    NAME vuln
-    WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
-    COMMAND ${PYTHON_EXECUTABLE} vuln.py
-)