Skip to content
Snippets Groups Projects
Commit 898c87cb authored by Matthew Fernandez's avatar Matthew Fernandez
Browse files

Merge branch '23CD380E-C5C0-414F-B23F-122C42B26417' into 'master'

remove testing pieces from CMake build

Closes #1795

See merge request !1584
parents dde9979a 83899df1
No related branches found
No related tags found
1 merge request!1584remove testing pieces from CMake build
Pipeline #194744693 passed
......@@ -13,6 +13,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
### Changed
- Cgraph's agheap() API has been removed
- 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
......
......@@ -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}")
......
......@@ -364,8 +364,6 @@ else
CFLAGS=`echo ${CFLAGS} | sed 's/ -pipe//'`
# icc doesn't like -ffast-math
CFLAGS=`echo ${CFLAGS} | sed 's/ -ffast-math//'`
# icc doesn't like -O2
CFLAGS=`echo ${CFLAGS} | sed 's/ -O2/ -O0/'`
;;
* )
case "${build}" in
......@@ -383,17 +381,6 @@ else
CFLAGS="${CFLAGS} -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math"
;;
* )
# -Wno-unused-parameter only needed for bug in gcc3
# this test from: http://cvs.auriga.wearlab.de/cgi-bin/cvsweb.cgi/dillo/configure.in?rev=1.90;content-type=text%2Fplain;cvsroot=dillo
if test "`$CC -v 2>&1 | $EGREP 'version 3'`" != ""; then
CFLAGS="${CFLAGS} -Wno-unused-parameter"
# bug 1199
case "${host_cpu}" in
sparc* )
CFLAGS="${CFLAGS} -DUSE_MAXFLOAT"
;;
esac
fi
CFLAGS="${CFLAGS} -Wno-unknown-pragmas -Wstrict-prototypes -Wpointer-arith -Wall -ffast-math"
;;
esac
......
find_package(PythonInterp)
if (PYTHONINTERP_FOUND)
add_subdirectory(regression_tests)
else ()
message(WARNING "Python interperter not found, required for regression tests.")
endif ()
add_subdirectory(shapes)
#### vuln tests cause appveyor build fails because reference is not the same for all os/dist - disabled
# add_subdirectory(vuln)
add_test(
NAME shapes
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
COMMAND ${PYTHON_EXECUTABLE} shapes.py
)
add_test(
NAME vuln
WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
COMMAND ${PYTHON_EXECUTABLE} vuln.py
)
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment