Skip to content

Commit b354e44

Browse files
committed
fix alignments in test CMakeFile
1 parent ba21b06 commit b354e44

1 file changed

Lines changed: 26 additions & 25 deletions

File tree

tests/CMakeLists.txt

Lines changed: 26 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ function(set_test test_name)
2525
endif()
2626
endif()
2727

28-
message(STATUS "Added test: ${test_name}...")
28+
message(STATUS "Added test: ${test_name}...")
2929
endfunction()
3030

31-
add_definitions( -DTESTDATA_DIR=\"${osm2pgsql_SOURCE_DIR}/tests/data/\" )
32-
add_definitions( -DOSM2PGSQLDATA_DIR=\"${osm2pgsql_SOURCE_DIR}/\" )
31+
add_definitions(-DTESTDATA_DIR=\"${osm2pgsql_SOURCE_DIR}/tests/data/\")
32+
add_definitions(-DOSM2PGSQLDATA_DIR=\"${osm2pgsql_SOURCE_DIR}/\")
3333
3434
add_library(catch_main_lib STATIC catch-main.cpp)
3535
@@ -64,35 +64,36 @@ set_test(test-wildcard-match LABELS NoDB)
6464
6565
# Fixture for creating test tablespace under a pg_virtualenv
6666
if (NOT WIN32)
67-
message(STATUS "Added tablespace fixture...")
68-
add_test(NAME FixtureTablespaceSetup
69-
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fixture-tablespace-setup
70-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
71-
add_test(NAME FixtureTablespaceCleanup
72-
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fixture-tablespace-cleanup
73-
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
67+
message(STATUS "Added tablespace fixture...")
68+
add_test(NAME FixtureTablespaceSetup
69+
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fixture-tablespace-setup
70+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
71+
add_test(NAME FixtureTablespaceCleanup
72+
COMMAND ${CMAKE_CURRENT_SOURCE_DIR}/fixture-tablespace-cleanup
73+
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
7474
75-
set_tests_properties(FixtureTablespaceSetup PROPERTIES FIXTURES_SETUP Tablespace)
76-
set_tests_properties(FixtureTablespaceCleanup PROPERTIES FIXTURES_CLEANUP Tablespace)
75+
set_tests_properties(FixtureTablespaceSetup PROPERTIES FIXTURES_SETUP Tablespace)
76+
set_tests_properties(FixtureTablespaceCleanup PROPERTIES FIXTURES_CLEANUP Tablespace)
7777
endif()
7878
7979
if (NOT HAVE_LUA)
80-
# these tests require LUA support
81-
set_tests_properties(test-output-multi-poly-trivial PROPERTIES WILL_FAIL on)
82-
set_tests_properties(test-output-multi-tags PROPERTIES WILL_FAIL on)
80+
# these tests require LUA support
81+
set_tests_properties(test-output-multi-poly-trivial PROPERTIES WILL_FAIL on)
82+
set_tests_properties(test-output-multi-tags PROPERTIES WILL_FAIL on)
8383
endif()
8484
8585
find_package(PythonInterp 3)
8686
8787
if (PYTHONINTERP_FOUND)
88-
add_test(NAME regression-test-pbf COMMAND ${PYTHON_EXECUTABLE} ${osm2pgsql_SOURCE_DIR}/tests/regression-test.py -f ${osm2pgsql_SOURCE_DIR}/tests/data/liechtenstein-2013-08-03.osm.pbf -x $<TARGET_FILE:osm2pgsql>
89-
WORKING_DIRECTORY ${osm2pgsql_SOURCE_DIR})
90-
set_tests_properties(regression-test-pbf PROPERTIES TIMEOUT ${TESTING_TIMEOUT})
91-
set_tests_properties(regression-test-pbf
92-
PROPERTIES ENVIRONMENT "HAVE_LUA=${LUA_FOUND}")
93-
set_tests_properties(regression-test-pbf
94-
PROPERTIES FIXTURES_REQUIRED Tablespace)
95-
message(STATUS "Added test: regression-test-pbf (needs Python with psycopg2 module)")
96-
else()
97-
message(WARNING "Can not find python, regression test disabled")
88+
add_test(NAME regression-test-pbf
89+
COMMAND ${PYTHON_EXECUTABLE} ${osm2pgsql_SOURCE_DIR}/tests/regression-test.py -f ${osm2pgsql_SOURCE_DIR}/tests/data/liechtenstein-2013-08-03.osm.pbf -x $<TARGET_FILE:osm2pgsql>
90+
WORKING_DIRECTORY ${osm2pgsql_SOURCE_DIR})
91+
set_tests_properties(regression-test-pbf PROPERTIES TIMEOUT ${TESTING_TIMEOUT})
92+
set_tests_properties(regression-test-pbf
93+
PROPERTIES ENVIRONMENT "HAVE_LUA=${LUA_FOUND}")
94+
set_tests_properties(regression-test-pbf
95+
PROPERTIES FIXTURES_REQUIRED Tablespace)
96+
message(STATUS "Added test: regression-test-pbf (needs Python with psycopg2 module)")
97+
else()
98+
message(WARNING "Can not find python, regression test disabled")
9899
endif()

0 commit comments

Comments
 (0)