move new tests into place

2019-11-05 23:32:37 +01:00 · 2019-11-05 23:32:37 +01:00 · 8859b6eb8e
parent 8678be3374
commit 8859b6eb8e
65 changed files with 2 additions and 2 deletions
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@ -270,9 +270,9 @@ enable_testing()
 include(CTest)

 if (BUILD_TESTS)
-  add_subdirectory(newtests)
+  add_subdirectory(tests)
 else()
-  add_subdirectory(newtests EXCLUDE_FROM_ALL)
+  add_subdirectory(tests EXCLUDE_FROM_ALL)
 endif()


--- a/newtests/CMakeLists.txt
+++ b/newtests/CMakeLists.txt
--- a/newtests/catch-main.cpp
+++ b/newtests/catch-main.cpp
--- a/newtests/catch.hpp
+++ b/newtests/catch.hpp
--- a/newtests/common-cleanup.hpp
+++ b/newtests/common-cleanup.hpp
--- a/newtests/common-import.hpp
+++ b/newtests/common-import.hpp
--- a/newtests/common-options.hpp
+++ b/newtests/common-options.hpp
--- a/newtests/common-pg.hpp
+++ b/newtests/common-pg.hpp
--- a/newtests/data/gazetteer-test.style
+++ b/newtests/data/gazetteer-test.style
--- a/tests/data/tests/000466354.osc.gz
+++ b/tests/data/tests/000466354.osc.gz
--- a/tests/data/tests/008-ch.osc.gz
+++ b/tests/data/tests/008-ch.osc.gz
--- a/tests/data/tests/gazetteer-test.style
+++ b/tests/data/tests/gazetteer-test.style
--- a/tests/data/tests/hstore-match-only.osm
+++ b/tests/data/tests/hstore-match-only.osm
--- a/tests/data/tests/hstore-match-only.style
+++ b/tests/data/tests/hstore-match-only.style
--- a/tests/data/tests/liechtenstein-2013-08-03.osm.pbf
+++ b/tests/data/tests/liechtenstein-2013-08-03.osm.pbf
--- a/tests/data/tests/test_multipolygon.osm
+++ b/tests/data/tests/test_multipolygon.osm
--- a/tests/data/tests/test_multipolygon_diff.osc
+++ b/tests/data/tests/test_multipolygon_diff.osc
--- a/tests/data/tests/test_multipolygon_postdiff.osm
+++ b/tests/data/tests/test_multipolygon_postdiff.osm
--- a/tests/data/tests/test_output_multi_line_storage.osm
+++ b/tests/data/tests/test_output_multi_line_storage.osm
--- a/tests/data/tests/test_output_multi_line_trivial.lua
+++ b/tests/data/tests/test_output_multi_line_trivial.lua
--- a/tests/data/tests/test_output_multi_line_trivial.style.json
+++ b/tests/data/tests/test_output_multi_line_trivial.style.json
--- a/tests/data/tests/test_output_multi_poly_trivial.lua
+++ b/tests/data/tests/test_output_multi_poly_trivial.lua
--- a/tests/data/tests/test_output_multi_poly_trivial.osm
+++ b/tests/data/tests/test_output_multi_poly_trivial.osm
--- a/tests/data/tests/test_output_multi_poly_trivial.style.json
+++ b/tests/data/tests/test_output_multi_poly_trivial.style.json
--- a/tests/data/tests/test_output_multi_tags.json
+++ b/tests/data/tests/test_output_multi_tags.json
--- a/tests/data/tests/test_output_multi_tags.lua
+++ b/tests/data/tests/test_output_multi_tags.lua
--- a/tests/data/tests/test_output_multi_tags.osm
+++ b/tests/data/tests/test_output_multi_tags.osm
--- a/tests/data/tests/test_output_pgsql_area.osm
+++ b/tests/data/tests/test_output_pgsql_area.osm
--- a/tests/data/tests/test_output_pgsql_int4.osm
+++ b/tests/data/tests/test_output_pgsql_int4.osm
--- a/tests/data/tests/test_output_pgsql_int4.style
+++ b/tests/data/tests/test_output_pgsql_int4.style
--- a/tests/data/tests/test_output_pgsql_route_rel.osm
+++ b/tests/data/tests/test_output_pgsql_route_rel.osm
--- a/tests/data/tests/test_output_pgsql_validgeom.osm
+++ b/tests/data/tests/test_output_pgsql_validgeom.osm
--- a/tests/data/tests/test_output_pgsql_way_area.osm
+++ b/tests/data/tests/test_output_pgsql_way_area.osm
--- a/tests/data/tests/test_output_pgsql_z_order.osm
+++ b/tests/data/tests/test_output_pgsql_z_order.osm
--- a/newtests/fixture-tablespace-cleanup
+++ b/newtests/fixture-tablespace-cleanup
--- a/newtests/fixture-tablespace-setup
+++ b/newtests/fixture-tablespace-setup
--- a/newtests/regression-test.py
+++ b/newtests/regression-test.py
--- a/newtests/regression-test.sh
+++ b/newtests/regression-test.sh
--- a/newtests/test-db-copy-mgr.cpp
+++ b/newtests/test-db-copy-mgr.cpp
--- a/newtests/test-db-copy-thread.cpp
+++ b/newtests/test-db-copy-thread.cpp
--- a/newtests/test-expire-tiles.cpp
+++ b/newtests/test-expire-tiles.cpp
--- a/newtests/test-middle.cpp
+++ b/newtests/test-middle.cpp
--- a/newtests/test-options-database.cpp
+++ b/newtests/test-options-database.cpp
--- a/newtests/test-options-parse.cpp
+++ b/newtests/test-options-parse.cpp
--- a/newtests/test-options-projection.cpp
+++ b/newtests/test-options-projection.cpp
--- a/newtests/test-output-gazetteer.cpp
+++ b/newtests/test-output-gazetteer.cpp
--- a/newtests/test-output-multi-line-storage.cpp
+++ b/newtests/test-output-multi-line-storage.cpp
--- a/newtests/test-output-multi-line.cpp
+++ b/newtests/test-output-multi-line.cpp
--- a/newtests/test-output-multi-point-multi-table.cpp
+++ b/newtests/test-output-multi-point-multi-table.cpp
--- a/newtests/test-output-multi-point.cpp
+++ b/newtests/test-output-multi-point.cpp
--- a/newtests/test-output-multi-poly-trivial.cpp
+++ b/newtests/test-output-multi-poly-trivial.cpp
--- a/newtests/test-output-multi-polygon.cpp
+++ b/newtests/test-output-multi-polygon.cpp
--- a/newtests/test-output-multi-tags.cpp
+++ b/newtests/test-output-multi-tags.cpp
--- a/newtests/test-output-pgsql-area.cpp
+++ b/newtests/test-output-pgsql-area.cpp
--- a/newtests/test-output-pgsql-hstore-match-only.cpp
+++ b/newtests/test-output-pgsql-hstore-match-only.cpp
--- a/newtests/test-output-pgsql-int4.cpp
+++ b/newtests/test-output-pgsql-int4.cpp
--- a/newtests/test-output-pgsql-schema.cpp
+++ b/newtests/test-output-pgsql-schema.cpp
--- a/newtests/test-output-pgsql-tablespace.cpp
+++ b/newtests/test-output-pgsql-tablespace.cpp
--- a/newtests/test-output-pgsql-validgeom.cpp
+++ b/newtests/test-output-pgsql-validgeom.cpp
--- a/newtests/test-output-pgsql-z_order.cpp
+++ b/newtests/test-output-pgsql-z_order.cpp
--- a/newtests/test-output-pgsql.cpp
+++ b/newtests/test-output-pgsql.cpp
--- a/newtests/test-parse-osmium.cpp
+++ b/newtests/test-parse-osmium.cpp
--- a/newtests/test-persistent-cache.cpp
+++ b/newtests/test-persistent-cache.cpp
--- a/newtests/test-ram-cache.cpp
+++ b/newtests/test-ram-cache.cpp
--- a/newtests/test-wildcard-match.cpp
+++ b/newtests/test-wildcard-match.cpp