Skip to content

Commit 9998094

Browse files
committed
skip python jsontestrunner by default
To run these tests, in cmake build-dir: make jsoncpp_check TravisCI is now set to run these always. For now, the test_json_lib unit-tests will still run. issue open-source-parsers#187
1 parent 4ac4cac commit 9998094

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

.travis.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ language: cpp
77
compiler:
88
- gcc
99
- clang
10-
script: cmake -DJSONCPP_WITH_CMAKE_PACKAGE=$CMAKE_PKG -DJSONCPP_LIB_BUILD_SHARED=$SHARED_LIB -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_VERBOSE_MAKEFILE=$VERBOSE_MAKE . && make
10+
script: cmake -DJSONCPP_WITH_CMAKE_PACKAGE=$CMAKE_PKG -DJSONCPP_LIB_BUILD_SHARED=$SHARED_LIB -DCMAKE_BUILD_TYPE=$BUILD_TYPE -DCMAKE_VERBOSE_MAKEFILE=$VERBOSE_MAKE . && make && make jsoncpp_check
1111
env:
1212
matrix:
1313
- SHARED_LIB=ON STATIC_LIB=ON CMAKE_PKG=ON BUILD_TYPE=release VERBOSE_MAKE=false

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 2.8.5)
22
PROJECT(jsoncpp)
33
ENABLE_TESTING()
44

5-
OPTION(JSONCPP_WITH_TESTS "Compile and run JsonCpp test executables" ON)
5+
OPTION(JSONCPP_WITH_TESTS "Compile and (for jsoncpp_check) run JsonCpp test executables" ON)
66
OPTION(JSONCPP_WITH_POST_BUILD_UNITTEST "Automatically run unit-tests as a post build step" ON)
77
OPTION(JSONCPP_WITH_WARNING_AS_ERROR "Force compilation to fail if a warning occurs" OFF)
88
OPTION(JSONCPP_WITH_PKGCONFIG_SUPPORT "Generate and install .pc files" ON)

src/jsontestrunner/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ IF(PYTHONINTERP_FOUND)
2020
# Run end to end parser/writer tests
2121
SET(TEST_DIR ${CMAKE_CURRENT_SOURCE_DIR}/../../test)
2222
SET(RUNJSONTESTS_PATH ${TEST_DIR}/runjsontests.py)
23-
ADD_CUSTOM_TARGET(jsoncpp_readerwriter_tests ALL
23+
ADD_CUSTOM_TARGET(jsoncpp_readerwriter_tests
2424
"${PYTHON_EXECUTABLE}" -B "${RUNJSONTESTS_PATH}" $<TARGET_FILE:jsontestrunner_exe> "${TEST_DIR}/data"
2525
DEPENDS jsontestrunner_exe jsoncpp_test
2626
)

0 commit comments

Comments
 (0)