From 03671ea75ede0361c55b547525b2d917f67ce067 Mon Sep 17 00:00:00 2001 From: Mike Neilson Date: Thu, 10 Mar 2022 20:13:38 -0800 Subject: [PATCH] Fixed ddl2cpp test setup and checks. cmake file contained extra parameter that appears to no longer be used. bad_has_parse_error test output check was not longer valid. --- tests/scripts/CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/scripts/CMakeLists.txt b/tests/scripts/CMakeLists.txt index 0b5b9090..ee267dd4 100644 --- a/tests/scripts/CMakeLists.txt +++ b/tests/scripts/CMakeLists.txt @@ -39,21 +39,21 @@ if (${Python3_Interpreter_FOUND}) message(STATUS "Pyparsing is installed: Enabling ddl2cpp tests.") add_test(NAME sqlpp11.scripts.ddl2cpp.bad_will_fail - COMMAND "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_LIST_DIR}/../../scripts/ddl2cpp" -fail-on-parse + COMMAND "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_LIST_DIR}/../../scripts/ddl2cpp" "${CMAKE_CURRENT_LIST_DIR}/ddl2cpp_sample_bad.sql" "${CMAKE_CURRENT_BINARY_DIR}/fail" test) set_tests_properties(sqlpp11.scripts.ddl2cpp.bad_will_fail PROPERTIES WILL_FAIL 1) add_test(NAME sqlpp11.scripts.ddl2cpp.bad_has_parse_error - COMMAND "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_LIST_DIR}/../../scripts/ddl2cpp" -fail-on-parse + COMMAND "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_LIST_DIR}/../../scripts/ddl2cpp" "${CMAKE_CURRENT_LIST_DIR}/ddl2cpp_sample_bad.sql" "${CMAKE_CURRENT_BINARY_DIR}/fail" test) - set_tests_properties(sqlpp11.scripts.ddl2cpp.bad_has_parse_error PROPERTIES PASS_REGULAR_EXPRESSION "Parsing error,.*") + set_tests_properties(sqlpp11.scripts.ddl2cpp.bad_has_parse_error PROPERTIES PASS_REGULAR_EXPRESSION "ERROR: Could not parse.*") add_test(NAME sqlpp11.scripts.ddl2cpp.good_succeeds - COMMAND "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_LIST_DIR}/../../scripts/ddl2cpp" -fail-on-parse + COMMAND "${Python3_EXECUTABLE}" "${CMAKE_CURRENT_LIST_DIR}/../../scripts/ddl2cpp" "${CMAKE_CURRENT_LIST_DIR}/ddl2cpp_sample_good.sql" "${CMAKE_CURRENT_BINARY_DIR}/fail" test)