CL: Restored CMakeLists to original state
This commit is contained in:
parent
2a2d2d25d1
commit
56bb4a4af4
@ -5,9 +5,9 @@ set(DRAFT "draft7")
|
||||
# find schema-test-suite
|
||||
find_path(JSON_SCHEMA_TEST_SUITE_PATH
|
||||
NAMES
|
||||
tests/${DRAFT})
|
||||
tests/${DRAFT})
|
||||
|
||||
if(NOT JSON_SCHEMA_TEST_SUITE_PATH)
|
||||
if (NOT JSON_SCHEMA_TEST_SUITE_PATH)
|
||||
message(STATUS "Set JSON_SCHEMA_TEST_SUITE_PATH to a path in which JSON-Schema-Test-Suite is located (github.com/json-schema-org/JSON-Schema-Test-Suite). Using internal test-suite which might be out of date.")
|
||||
set(JSON_SCHEMA_TEST_SUITE_PATH ${CMAKE_CURRENT_SOURCE_DIR})
|
||||
endif()
|
||||
@ -18,7 +18,7 @@ if(JSON_SCHEMA_TEST_SUITE_PATH)
|
||||
target_link_libraries(json-schema-test nlohmann_json_schema_validator)
|
||||
target_compile_definitions(json-schema-test
|
||||
PRIVATE
|
||||
JSON_SCHEMA_TEST_SUITE_PATH="${JSON_SCHEMA_TEST_SUITE_PATH}")
|
||||
JSON_SCHEMA_TEST_SUITE_PATH="${JSON_SCHEMA_TEST_SUITE_PATH}")
|
||||
|
||||
option(JSON_SCHEMA_ENABLE_OPTIONAL_TESTS "Enable optional tests of the JSONSchema Test Suite" ON)
|
||||
|
||||
@ -28,23 +28,23 @@ if(JSON_SCHEMA_TEST_SUITE_PATH)
|
||||
foreach(TEST_FILE ${TEST_FILES})
|
||||
get_filename_component(TEST_NAME ${TEST_FILE} NAME_WE)
|
||||
add_test(NAME "${JSON_SCHEMA_TEST_PREFIX}::${TEST_NAME}"
|
||||
COMMAND ${PIPE_IN_TEST_SCRIPT} $<TARGET_FILE:json-schema-test> ${TEST_FILE})
|
||||
COMMAND ${PIPE_IN_TEST_SCRIPT} $<TARGET_FILE:json-schema-test> ${TEST_FILE})
|
||||
endforeach()
|
||||
|
||||
if(JSON_SCHEMA_ENABLE_OPTIONAL_TESTS)
|
||||
if (JSON_SCHEMA_ENABLE_OPTIONAL_TESTS)
|
||||
file(GLOB OPT_TEST_FILES ${JSON_SCHEMA_TEST_SUITE_PATH}/tests/${DRAFT}/optional/*.json)
|
||||
file(GLOB FORMAT_TEST_FILES ${JSON_SCHEMA_TEST_SUITE_PATH}/tests/${DRAFT}/optional/format/*.json)
|
||||
|
||||
foreach(TEST_FILE ${OPT_TEST_FILES})
|
||||
get_filename_component(TEST_NAME ${TEST_FILE} NAME_WE)
|
||||
add_test(NAME "${JSON_SCHEMA_TEST_PREFIX}::Optional::${TEST_NAME}"
|
||||
COMMAND ${PIPE_IN_TEST_SCRIPT} $<TARGET_FILE:json-schema-test> ${TEST_FILE})
|
||||
COMMAND ${PIPE_IN_TEST_SCRIPT} $<TARGET_FILE:json-schema-test> ${TEST_FILE})
|
||||
endforeach()
|
||||
|
||||
foreach(TEST_FILE ${FORMAT_TEST_FILES})
|
||||
get_filename_component(TEST_NAME ${TEST_FILE} NAME_WE)
|
||||
add_test(NAME "${JSON_SCHEMA_TEST_PREFIX}::Optional::Format::${TEST_NAME}"
|
||||
COMMAND ${PIPE_IN_TEST_SCRIPT} $<TARGET_FILE:json-schema-test> ${TEST_FILE})
|
||||
COMMAND ${PIPE_IN_TEST_SCRIPT} $<TARGET_FILE:json-schema-test> ${TEST_FILE})
|
||||
endforeach()
|
||||
|
||||
# some optional tests will fail
|
||||
@ -65,7 +65,7 @@ if(JSON_SCHEMA_TEST_SUITE_PATH)
|
||||
JSON-Suite::Optional::unicode
|
||||
|
||||
PROPERTIES
|
||||
WILL_FAIL ON)
|
||||
WILL_FAIL ON)
|
||||
endif()
|
||||
else()
|
||||
endif()
|
||||
|
||||
Loading…
Reference in New Issue
Block a user