change BDD run script to new style tester

Author: lonvia

CMakeLists.txt

@@ -308,10 +308,6 @@ if (BUILD_TESTS)
         set(TESTING_TIMEOUT 1200)
     endif()
     add_subdirectory(tests)
-    configure_file(
-        ${PROJECT_SOURCE_DIR}/tests/run-behave.in
-        ${PROJECT_BINARY_DIR}/run-behave
-    )
 else()
     message(STATUS "Tests disabled. Set BUILD_TESTS=ON to enable tests.")
 endif()

tests/CMakeLists.txt

@@ -118,14 +118,15 @@ if (NOT WIN32)
     set_tests_properties(FixtureTablespaceCleanup PROPERTIES FIXTURES_CLEANUP Tablespace)
 endif()
 
+configure_file(run-bdd-tests.in ${PROJECT_BINARY_DIR}/run-bdd-tests)
 
 find_program(BEHAVE_BIN NAMES behave)
 
 if (BEHAVE_BIN)
     foreach(BDD_TEST IN ITEMS command-line flex regression)
         add_test(NAME bdd-${BDD_TEST}
-                 COMMAND behave -DBINARY=$<TARGET_FILE:osm2pgsql> ${BDD_TEST}
-                 WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/bdd)
+                 COMMAND ./run-bdd-tests ${CMAKE_CURRENT_SOURCE_DIR}/bdd/${BDD_TEST}
+                 WORKING_DIRECTORY ${PROJECT_BINARY_DIR})
         message(STATUS "Added test: bdd-${BDD_TEST}")
     endforeach(BDD_TEST)
 

tests/run-bdd-tests.in

@@ -0,0 +1,3 @@
+#!/bin/sh
+
+@PROJECT_SOURCE_DIR@/scripts/osm2pgsql-test-style --style-data-dir @PROJECT_SOURCE_DIR@ --test-data-dir @CMAKE_CURRENT_SOURCE_DIR@/data/ --osm2pgsql-binary @PROJECT_BINARY_DIR@/osm2pgsql "$@"