Add submodule with osm-testdata repository.

Before this repository had to be installed externally. Now a submodule
update can be used to get the correct version of the osm-testdata
repository.

Author: joto

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "test/data-tests/osm-testdata"]
+	path = test/data-tests/osm-testdata
+	url = https://github.com/osmcode/osm-testdata

.travis.yml

@@ -210,7 +210,6 @@ matrix:
 
 install:
   - git clone --quiet --depth 1 https://github.com/mapbox/protozero.git ../protozero
-  - git clone --quiet --depth 1 https://github.com/osmcode/osm-testdata.git ../osm-testdata
   - |
     if [[ "${TRAVIS_OS_NAME}" == "osx" ]]; then
       brew remove gdal
@@ -220,6 +219,7 @@ install:
 
 before_script:
   - cd ${TRAVIS_BUILD_DIR}
+  - git submodule update --init
   - mkdir build && cd build
   - cmake -LA .. -DCMAKE_BUILD_TYPE=${BUILD_TYPE} -DBUILD_WITH_CCACHE=1 -DOSM_TESTDATA="${TRAVIS_BUILD_DIR}/../osm-testdata"
 

CMakeLists.txt

@@ -513,8 +513,7 @@ include(CPack)
 if(BUILD_DATA_TESTS AND OSM_TESTDATA STREQUAL "OSM_TESTDATA-NOTFOUND")
     message("\n========================== WARNING ==========================")
     message("osm-testdata directory not found, data tests were disabled!\n")
-    message("You can get it from https://github.com/osmcode/osm-testdata")
-    message("Clone it into the same directory libosmium is in")
+    message("Call 'git submodule update --init' to install test data")
     message("or set the OSM_TESTDATA cmake variable to its path.")
     message("=============================================================\n")
 endif()

README.md

@@ -76,6 +76,14 @@ chapter in the manual.
 
 ## Testing
 
+To download the `osm-testdata` submodule call:
+
+```
+git submodule update --init
+```
+
+This will enable additional tests.
+
 See the
 [Libosmium Manual](http://osmcode.org/libosmium/manual.html#running-tests)
 for instructions.

appveyor.yml

@@ -36,8 +36,8 @@ clone_folder: c:\projects\libosmium
 # halts: "msys2-runtime and catgets are in conflict. Remove catgets?"
 # See also: https://github.com/Alexpux/MSYS2-packages/issues/1141
 install:
+  - git submodule update --init
   - cd c:\projects
-  - git clone --depth 1 https://github.com/osmcode/osm-testdata
   - git clone --depth 1 https://github.com/mapbox/protozero
   - if [%config%]==[MSYS2] (
           C:\msys64\usr\bin\pacman --noconfirm --sync --refresh --refresh --sysupgrade --sysupgrade --ask=20

test/data-tests/CMakeLists.txt

@@ -15,7 +15,7 @@ if(NOT GDAL_FOUND OR NOT EXPAT_FOUND)
 endif()
 
 message(STATUS "Looking for osm-testdata")
-find_path(OSM_TESTDATA grid/data/all.osm HINT ../../../osm-testdata)
+find_path(OSM_TESTDATA grid/data/all.osm HINT osm-testdata)
 if(OSM_TESTDATA STREQUAL "OSM_TESTDATA-NOTFOUND")
     message(STATUS "Looking for osm-testdata - not found (data tests disabled)")
     message(STATUS "Configuring data tests - failed")