summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2017-11-18 11:18:17 -0800
committerGitHub <noreply@github.com>2017-11-18 11:18:17 -0800
commit9f279be995da5f15a9a988fe93dc983401c28d95 (patch)
treefa40415766fdf1d2dc35f0814139ccad61515f72 /test
parentdb63ea9a07135568c44d537a9f2e999b210f0b9f (diff)
parent9253cbff4f28651ec31ed1e1e714c9093a1ac222 (diff)
Merge pull request #250 from nwellnhof/test-static-only-build
Test static-only build
Diffstat (limited to 'test')
-rwxr-xr-xtest/CMakeLists.txt6
1 files changed, 3 insertions, 3 deletions
diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 6da3a6b..5c07fb7 100755
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,7 +9,7 @@ else(SPEC_TESTS)
find_package(PythonInterp 3)
endif(SPEC_TESTS)
-if (CMARK_SHARED)
+if (CMARK_SHARED OR CMARK_STATIC)
add_test(NAME api_test COMMAND api_test)
endif()
@@ -41,14 +41,14 @@ IF (PYTHONINTERP_FOUND)
"--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
)
- add_test(roundtriptest_executable
+ add_test(roundtriptest_library
${PYTHON_EXECUTABLE}
"${CMAKE_CURRENT_SOURCE_DIR}/roundtrip_tests.py"
"--spec" "${CMAKE_CURRENT_SOURCE_DIR}/spec.txt"
"--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"
)
- add_test(entity_executable
+ add_test(entity_library
${PYTHON_EXECUTABLE}
"${CMAKE_CURRENT_SOURCE_DIR}/entity_tests.py"
"--library-dir" "${CMAKE_CURRENT_BINARY_DIR}/../src"