diff --git a/test/cmake-install/CMakeLists.txt b/test/cmake-install/CMakeLists.txt deleted file mode 100644 index 603348f..0000000 --- a/test/cmake-install/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -# Configure install script -configure_file(test.sh.in - ${CMAKE_CURRENT_BINARY_DIR}/test.sh @ONLY) - -get_filename_component(TEST_NAME - ${CMAKE_CURRENT_SOURCE_DIR} - NAME) - - -# this build test only works, if nlohmann-json was found via a cmake-package -if(TARGET nlohmann_json::nlohmann_json) - add_test(NAME Build::${TEST_NAME} - COMMAND ${CMAKE_CURRENT_BINARY_DIR}/test.sh - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -endif() diff --git a/test/cmake-install/project/CMakeLists.txt b/test/cmake-install/project/CMakeLists.txt deleted file mode 100644 index fec21a5..0000000 --- a/test/cmake-install/project/CMakeLists.txt +++ /dev/null @@ -1,34 +0,0 @@ -# This is a simple project that tests using cmake to load the installed libraries -cmake_minimum_required(VERSION 3.2) - -project(cmake_install_test LANGUAGES CXX) - -set(PROJECT_VERSION 1.0.0) - -# Find the nlohmann_json and the validator package -set(CMAKE_FIND_DEBUG_MODE ON) -find_package(nlohmann_json REQUIRED) -find_package(nlohmann_json_schema_validator REQUIRED) - -# Add simple json-schema-validator-executable -add_executable(json-schema-validate ${CMAKE_CURRENT_SOURCE_DIR}/../../../example/json-schema-validate.cpp) -target_link_libraries(json-schema-validate nlohmann_json_schema_validator) - -enable_testing() - -# Add built-in tests function needed for issues -set(PIPE_IN_TEST_SCRIPT ${CMAKE_CURRENT_SOURCE_DIR}/../../test-pipe-in.sh) -function(add_test_simple_schema name schema instance) - add_test( - NAME ${name} - COMMAND ${PIPE_IN_TEST_SCRIPT} - $ - ${schema} - ${instance} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}) -endfunction() - -# Run tests for issues 9, 12, 27, 48, 54 -foreach(NUMBER "9" "12" "27" "48" "54") - add_subdirectory("${CMAKE_CURRENT_SOURCE_DIR}/../../issue-${NUMBER}" "${CMAKE_CURRENT_BINARY_DIR}/issue-${NUMBER}" EXCLUDE_FROM_ALL) -endforeach() diff --git a/test/cmake-install/test.sh.in b/test/cmake-install/test.sh.in deleted file mode 100755 index 466bcbf..0000000 --- a/test/cmake-install/test.sh.in +++ /dev/null @@ -1,55 +0,0 @@ -#!/bin/bash - -## Configure, build, install, and test json-schema-validator with CMAKE -## This script is instantiated via configure_file() to run cmake the same the original build has been invoked. - -set -xe - -EXTRA_ARGS=$@ -SRC_DIR=@PROJECT_SOURCE_DIR@ -BUILD_DIR=@CMAKE_CURRENT_BINARY_DIR@/build-dir -INSTALL_DIR=@CMAKE_CURRENT_BINARY_DIR@/install-dir -NLOHMANN_JSON_DIR=@nlohmann_json_DIR@ -TEST_SRC_DIR=@CMAKE_CURRENT_SOURCE_DIR@/project - -cmake --version - -# Clear out build directory -rm -rf ${BUILD_DIR} -# Create build-dir -mkdir -p ${BUILD_DIR} -cd ${BUILD_DIR} - -# configure json-schema-validator -printf "\n-----------------------------------------------------------\n" -printf "Configuring, building, and installing json-schema-validator" -printf "\n-----------------------------------------------------------\n" -cmake \ - -DCMAKE_INSTALL_PREFIX:PATH=${INSTALL_DIR} \ - -Dnlohmann_json_DIR:PATH=${NLOHMANN_JSON_DIR} \ - ${EXTRA_ARGS} \ - ${SRC_DIR} - -CPU_COUNT=$(nproc) - -# Build and install json-schema-validator -cmake --build . -- -j${CPU_COUNT} -cmake --build . --target install -- -j${CPU_COUNT} - -# Make sure build directory is empty -rm -rf ./* - -# configure test project -printf "\n-----------------------------------------------------------\n" -printf "Configuring, building, and running test project" -printf "\n-----------------------------------------------------------\n" -cmake \ - -Dnlohmann_json_DIR:PATH=${NLOHMANN_JSON_DIR} \ - -Dnlohmann_json_schema_validator_DIR:PATH=${INSTALL_DIR}/lib/cmake/nlohmann_json_schema_validator \ - -DVALIDATOR_INSTALL_DIR:PATH=${INSTALL_DIR} \ - ${EXTRA_ARGS} \ - ${TEST_SRC_DIR} - -# Build test project and test -cmake --build . -ctest --output-on-failure