Add tests for MemcacheD storage backend (#362)

_Also_: * Added background `renderd` process testing * Added `renderd` section without `stats_file` testing * Added `render_*` via TCP tests * Added `render_* --verbose` tests * Added `render_expired --delete-from` tests * Added `render_expired --no-progress` tests * Added `render_expired --touch-from` tests * Added `PARAMETERIZE_STYPE=language` map configuration testing * Added `HTCPHOST`/`HOST` map configuration testing
2025-07-28 23:23:55 +00:00 · 2024-01-06 13:25:49 -07:00
parent 6c1d89005e
commit d8cd8dea9a
7 changed files with 495 additions and 361 deletions
--- a/.github/actions/cmake/test/action.yml
+++ b/.github/actions/cmake/test/action.yml
@ -1,4 +1,8 @@
 ---
+inputs:
+  options:
+    default: --exclude-regex 'clear_dirs_.+|remove_tile_.+' --output-on-failure
+
 runs:
  using: composite
  steps:
@ -10,7 +14,7 @@ runs:
      shell: bash --noprofile --norc -euxo pipefail {0}

    - name: Test `mod_tile`
-      run: ctest --exclude-regex 'clear_dirs|remove_tiles' --output-on-failure
+      run: ctest ${{ inputs.options }}
      shell: bash --noprofile --norc -euxo pipefail {0}
      working-directory: build

--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@ -26,7 +26,9 @@ jobs:
        with:
          ubuntu-test-dependencies: >-
            apache2
+            jq
            lcov
+            memcached

      - name: Build `mod_tile`
        uses: ./.github/actions/cmake/build
@ -36,7 +38,6 @@ jobs:

      - name: Process `mod_tile` coverage results
        run: |
-          ctest -T coverage
          lcov \
            --capture \
            --directory . \
--- a/docker/debian/Dockerfile
+++ b/docker/debian/Dockerfile
@ -27,7 +27,8 @@ RUN --mount=id=debian:${debian_version}-/var/cache/apt,sharing=locked,target=/va
        libiniparser-dev \
        libmapnik-dev \
        libmemcached-dev \
-        librados-dev
+        librados-dev \
+        netbase

 ## Build, Test & Install `mod_tile`
 COPY . /tmp/mod_tile_src
--- a/docker/ubuntu/Dockerfile
+++ b/docker/ubuntu/Dockerfile
@ -27,7 +27,8 @@ RUN --mount=id=ubuntu:${ubuntu_version}-/var/cache/apt,sharing=locked,target=/va
        libiniparser-dev \
        libmapnik-dev \
        libmemcached-dev \
-        librados-dev
+        librados-dev \
+        netbase

 ## Build, Test & Install `mod_tile`
 COPY . /tmp/mod_tile_src
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@ -25,6 +25,7 @@ find_program(HTTPD_EXECUTABLE NAMES ${HTTPD_PROGNAME} REQUIRED)
 find_program(ID_EXECUTABLE NAMES id REQUIRED)
 find_program(JQ_EXECUTABLE NAMES jq)
 find_program(KILL_EXECUTABLE NAMES kill REQUIRED)
+find_program(MEMCACHED_EXECUTABLE NAMES memcached)
 find_program(MKDIR_EXECUTABLE NAMES mkdir REQUIRED)
 find_program(SHA256SUM_EXECUTABLE NAMES gsha256sum sha256sum REQUIRED)
 find_program(TOUCH_EXECUTABLE NAMES gtouch touch REQUIRED)
@ -36,24 +37,20 @@ find_program(TOUCH_EXECUTABLE NAMES gtouch touch REQUIRED)
 #-----------------------------------------------------------------------------

 set(DEFAULT_MAP_NAME "default")
-set(HTTPD0_HOST "0.0.0.0")
-set(HTTPD0_PORT "59980")
-set(HTTPD1_HOST "0.0.0.0")
-set(HTTPD1_PORT "59981")
-set(RENDERD1_HOST "0.0.0.0")
-set(RENDERD1_PORT "59991")
+set(HTTPD0_HOST "localhost")
+set(HTTPD0_PORT_BASE "59000")
+set(HTTPD1_HOST "localhost")
+set(HTTPD1_PORT_BASE "59100")
+set(MEMCACHED_HOST "localhost")
+set(MEMCACHED_PORT_BASE "60000")
+set(RENDERD1_HOST "localhost")
+set(RENDERD1_PORT_BASE "59500")
 set(WWW_USER_NAME "nobody")

 set(MAP_NAMES "jpg" "png256" "png32" "webp")

 set(TILE_ZXY "9/297/191")

-set(METRICS_OFF_URL "http://${HTTPD1_HOST}:${HTTPD1_PORT}/metrics")
-set(METRICS_ON_URL "http://${HTTPD0_HOST}:${HTTPD0_PORT}/metrics")
-set(MOD_TILE_OFF_URL "http://${HTTPD1_HOST}:${HTTPD1_PORT}/mod_tile")
-set(MOD_TILE_ON_URL "http://${HTTPD0_HOST}:${HTTPD0_PORT}/mod_tile")
-set(TILE_DEFAULT_TILEJSON_URL "http://${HTTPD0_HOST}:${HTTPD0_PORT}/tiles/${DEFAULT_MAP_NAME}/tile-layer.json")
-
 set(TILE_JPG_SHA256SUM "e09c3406c02f03583dadf0c8404c2d3efdc06a40d399e381ed2f47f49fde42d7")
 set(TILE_PNG256_SHA256SUM "dbf26531286e844a3a9735cdd193598dca78d22f77cafe5824bcaf17f88cbb08")
 set(TILE_PNG32_SHA256SUM "1006d92152f1e18896e0016fb43201b14bbcf7655955b74495ad3610541d325b")
@ -64,56 +61,29 @@ set(TILE_WEBP_SHA256SUM_04 "904593e291cce2561138bd83b704588c02c16630b8c133d78d53

 set(CURL_CMD "${CURL_EXECUTABLE} --fail --silent")

-set(HTTPD_START_CMD
-  "${HTTPD_EXECUTABLE} -e debug -f ${PROJECT_BINARY_DIR}/tests/conf/httpd.conf -k start"
-)
-string(REPLACE ";" "\n" HTTPD_START_CMD_STR "${HTTPD_START_CMD}")
-
-set(HTTPD_STOP_CMD
-  "${KILL_EXECUTABLE} $(${CAT_EXECUTABLE} run/httpd.pid)"
-  "${RM} run/httpd.pid"
-)
-string(REPLACE ";" "\n" HTTPD_STOP_CMD_STR "${HTTPD_STOP_CMD}")
-
-set(HTTPD_PID
-  "run/httpd.pid"
-)
-
-set(RENDERD_START_CMD
-  "$<TARGET_FILE:renderd> --config conf/renderd.conf --foreground --slave 0 > logs/renderd0.log 2>&1 &"
-  "printf \${!} > run/renderd0.pid"
-  "$<TARGET_FILE:renderd> --config conf/renderd.conf --foreground --slave 1 > logs/renderd1.log 2>&1 &"
-  "printf \${!} > run/renderd1.pid"
-)
-string(REPLACE ";" "\n" RENDERD_START_CMD_STR "${RENDERD_START_CMD}")
-
-set(RENDERD_STOP_CMD
-  "${KILL_EXECUTABLE} $(${CAT_EXECUTABLE} run/renderd1.pid)"
-  "${RM} run/renderd1.pid"
-  "${KILL_EXECUTABLE} $(${CAT_EXECUTABLE} run/renderd0.pid)"
-  "${RM} run/renderd0.pid"
-)
-string(REPLACE ";" "\n" RENDERD_STOP_CMD_STR "${RENDERD_STOP_CMD}")
-
-set(RENDERD_PIDS
-  "run/renderd0.pid"
-  "run/renderd1.pid"
-)
-
 execute_process(COMMAND ${ID_EXECUTABLE} -gn ${WWW_USER_NAME}
  OUTPUT_STRIP_TRAILING_WHITESPACE
  OUTPUT_VARIABLE WWW_GROUP_NAME
 )

-configure_file(
-  renderd.conf.in
-  conf/renderd.conf
+execute_process(COMMAND ${ID_EXECUTABLE} -un
+  OUTPUT_STRIP_TRAILING_WHITESPACE
+  OUTPUT_VARIABLE USER_NAME
 )

-configure_file(
-  httpd.conf.in
-  conf/httpd.conf
-)
+# Storage backend name (for display only)
+set(STORAGE_BACKENDS file)
+# Value of TILE_DIR in renderd.conf/httpd.conf
+set(TILE_DIRS "${PROJECT_BINARY_DIR}/tests/tiles")
+
+if(MEMCACHED_EXECUTABLE AND LIBMEMCACHED_FOUND)
+  # Add MemcacheD storage backend/TILE_DIR
+  list(APPEND TILE_DIRS "memcached://") # "memcached://${MEMCACHED_HOST}:${MEMCACHED_PORT}")
+  list(APPEND STORAGE_BACKENDS memcached_default) # memcached_custom)
+endif()
+
+list(LENGTH TILE_DIRS TILE_DIRS_LENGTH)
+math(EXPR TILE_DIRS_LENGTH "${TILE_DIRS_LENGTH} - 1")

 #-----------------------------------------------------------------------------
 #
@ -126,292 +96,442 @@ add_test(
  COMMAND gen_tile_test
  WORKING_DIRECTORY src
 )
-add_test(
-  NAME create_dirs
-  COMMAND ${MKDIR_EXECUTABLE} -p -v logs run tiles
-  WORKING_DIRECTORY tests
-)
-add_test(
-  NAME start_renderd
-  COMMAND ${BASH} -c "${RENDERD_START_CMD_STR}"
-  WORKING_DIRECTORY tests
-)
-add_test(
-  NAME start_httpd
-  COMMAND ${BASH} -c "${HTTPD_START_CMD_STR}"
-  WORKING_DIRECTORY tests
-)
-add_test(
-  NAME render_speedtest
-  COMMAND ${BASH} -c "
-    $<TARGET_FILE:render_speedtest> \
-      --map ${DEFAULT_MAP_NAME} \
-      --max-zoom 10 \
-      --socket ${PROJECT_BINARY_DIR}/tests/run/renderd0.sock
-  "
-  WORKING_DIRECTORY tests
-)
-add_test(
-  NAME render_expired
-  COMMAND ${BASH} -c "
-    echo '0/0/0' | $<TARGET_FILE:render_expired> \
-      --map ${DEFAULT_MAP_NAME} \
-      --max-zoom 5 \
-      --min-zoom 0 \
-      --num-threads 1 \
-      --socket ${PROJECT_BINARY_DIR}/tests/run/renderd0.sock \
-      --tile-dir ${PROJECT_BINARY_DIR}/tests/tiles
-  "
-  WORKING_DIRECTORY tests
-)
-add_test(
-  NAME render_list
-  COMMAND ${BASH} -c "
-    $<TARGET_FILE:render_list> \
-      --all \
-      --force \
-      --map ${DEFAULT_MAP_NAME} \
-      --max-zoom 5 \
-      --min-zoom 0 \
-      --num-threads 1 \
-      --socket ${PROJECT_BINARY_DIR}/tests/run/renderd0.sock \
-      --tile-dir ${PROJECT_BINARY_DIR}/tests/tiles
-  "
-  WORKING_DIRECTORY tests
-)
-add_test(
-  NAME render_old
-  COMMAND ${BASH} -c "
-    ${TOUCH_EXECUTABLE} -d '+1 month' ${PROJECT_BINARY_DIR}/tests/tiles/planet-import-complete
-    $<TARGET_FILE:render_old> \
-      --config ${PROJECT_BINARY_DIR}/tests/conf/renderd.conf \
-      --map ${DEFAULT_MAP_NAME} \
-      --max-zoom 5 \
-      --min-zoom 0 \
-      --num-threads 1 \
-      --socket ${PROJECT_BINARY_DIR}/tests/run/renderd0.sock \
-      --tile-dir ${PROJECT_BINARY_DIR}/tests/tiles
-  "
-  WORKING_DIRECTORY tests
-)

-foreach(MAP_NAME IN LISTS MAP_NAMES)
-  string(REGEX REPLACE "[0-9]+" "" EXTENSION ${MAP_NAME})
-  set(HTTPD0_URL "http://${HTTPD0_HOST}:${HTTPD0_PORT}/tiles/${MAP_NAME}/${TILE_ZXY}.${EXTENSION}")
-  set(HTTPD1_URL "http://${HTTPD1_HOST}:${HTTPD1_PORT}/tiles/${MAP_NAME}/${TILE_ZXY}.${EXTENSION}")
-  add_test(
-    NAME download_tile_${MAP_NAME}
-    COMMAND ${BASH} -c "
-      until $(${CURL_CMD} ${HTTPD0_URL} --output tile.${MAP_NAME}.0); do
-        echo 'Sleeping 1s (${MAP_NAME}.0)';
-        sleep 1;
-      done
-      until $(${CURL_CMD} ${HTTPD1_URL} --output tile.${MAP_NAME}.1); do
-        echo 'Sleeping 1s (${MAP_NAME}.1)';
-        sleep 1;
-      done
-    "
-    WORKING_DIRECTORY tests
-  )
-  set_tests_properties(download_tile_${MAP_NAME} PROPERTIES
-    FIXTURES_REQUIRED httpd_started
-    FIXTURES_SETUP tiles_downloaded
-    TIMEOUT 10
-  )
-  add_test(
-    NAME status_and_dirty_${MAP_NAME}
-    COMMAND ${BASH} -c "
-      TILE_DIRTY_ON_CMD=\"${CURL_CMD} ${HTTPD0_URL}/dirty\"
-      TILE_STATUS_ON_CMD=\"${CURL_CMD} ${HTTPD0_URL}/status\"
-      TILE_LAST_RENDERED_AT_OLD=$(\${TILE_STATUS_ON_CMD} | ${GREP_EXECUTABLE} -o 'Last rendered at [^\\.]*.')
-      echo \"Tile Last Rendered At (Old): \${TILE_LAST_RENDERED_AT_OLD}\"
-      sleep 1
-      TILE_DIRTY_ON_OUTPUT=$(\${TILE_DIRTY_ON_CMD})
-      echo \"Dirty: \${TILE_DIRTY_ON_OUTPUT}\"
-      if [ \"\${TILE_DIRTY_ON_OUTPUT}\" != \"Tile submitted for rendering\" ]; then
-        exit 1;
-      fi
-      TILE_LAST_RENDERED_AT_NEW=$(\${TILE_STATUS_ON_CMD} | ${GREP_EXECUTABLE} -o 'Last rendered at [^\\.]*.')
-      echo \"Tile Last Rendered At (New): \${TILE_LAST_RENDERED_AT_NEW}\"
-      until [ \"\${TILE_LAST_RENDERED_AT_OLD}\" != \"\${TILE_LAST_RENDERED_AT_NEW}\" ]; do
-        echo 'Sleeping 1s';
-        sleep 1;
-        TILE_LAST_RENDERED_AT_NEW=$(\${TILE_STATUS_ON_CMD} | ${GREP_EXECUTABLE} -o 'Last rendered at [^\\.]*.');
-        echo \"Tile Last Rendered At (New): \${TILE_LAST_RENDERED_AT_NEW}\";
-      done
-      TILE_DIRTY_OFF_CODE=$(${CURL_CMD} --write-out '%{http_code}' ${HTTPD1_URL}/dirty)
-      echo \"Dirty Off code: '\${TILE_DIRTY_OFF_CODE}'\"
-      if [ \"\${TILE_DIRTY_OFF_CODE}\" != \"404\" ]; then
-        exit 1;
-      fi
-      TILE_STATUS_OFF_CODE=$(${CURL_CMD} --write-out '%{http_code}' ${HTTPD1_URL}/status)
-      echo \"Status Off code: '\${TILE_STATUS_OFF_CODE}'\"
-      if [ \"\${TILE_STATUS_OFF_CODE}\" != \"404\" ]; then
-        exit 1;
-      fi
-    "
-    WORKING_DIRECTORY tests
-  )
-  set_tests_properties(status_and_dirty_${MAP_NAME} PROPERTIES
-    DEPENDS_ON download_tile_${MAP_NAME}
-    FIXTURES_REQUIRED httpd_started
-    TIMEOUT 20
-  )
-  add_test(
-    NAME remove_tile_${MAP_NAME}
-    COMMAND ${RM} -v tile.${MAP_NAME}.0 tile.${MAP_NAME}.1
-    WORKING_DIRECTORY tests
-  )
-  set_tests_properties(remove_tile_${MAP_NAME} PROPERTIES
-    DEPENDS_ON download_tile_${MAP_NAME}
-    FIXTURES_CLEANUP tiles_downloaded
-    REQUIRED_FILES "tile.${MAP_NAME}.0;tile.${MAP_NAME}.1"
-  )
-endforeach()
+foreach(TILE_DIR_INDEX RANGE ${TILE_DIRS_LENGTH})
+  list(GET TILE_DIRS ${TILE_DIR_INDEX} TILE_DIR)
+  list(GET STORAGE_BACKENDS ${TILE_DIR_INDEX} STORAGE_BACKEND)

-add_test(
-  NAME check_tiles
-  COMMAND ${BASH} -c "
-    (echo '${TILE_JPG_SHA256SUM}  tile.jpg.0' | ${SHA256SUM_EXECUTABLE} -c) && \
-    (echo '${TILE_JPG_SHA256SUM}  tile.jpg.1' | ${SHA256SUM_EXECUTABLE} -c) && \
-    (echo '${TILE_PNG256_SHA256SUM}  tile.png256.0' | ${SHA256SUM_EXECUTABLE} -c) && \
-    (echo '${TILE_PNG256_SHA256SUM}  tile.png256.1' | ${SHA256SUM_EXECUTABLE} -c) && \
-    (echo '${TILE_PNG32_SHA256SUM}  tile.png32.0' | ${SHA256SUM_EXECUTABLE} -c) && \
-    (echo '${TILE_PNG32_SHA256SUM}  tile.png32.1' | ${SHA256SUM_EXECUTABLE} -c) && \
-    ( \
-      (echo '${TILE_WEBP_SHA256SUM_01}  tile.webp.0' | ${SHA256SUM_EXECUTABLE} -c) || \
-      (echo '${TILE_WEBP_SHA256SUM_02}  tile.webp.0' | ${SHA256SUM_EXECUTABLE} -c) || \
-      (echo '${TILE_WEBP_SHA256SUM_03}  tile.webp.0' | ${SHA256SUM_EXECUTABLE} -c) || \
-      (echo '${TILE_WEBP_SHA256SUM_04}  tile.webp.0' | ${SHA256SUM_EXECUTABLE} -c) \
-    ) && \
-    ( \
-      (echo '${TILE_WEBP_SHA256SUM_01}  tile.webp.1' | ${SHA256SUM_EXECUTABLE} -c) || \
-      (echo '${TILE_WEBP_SHA256SUM_02}  tile.webp.1' | ${SHA256SUM_EXECUTABLE} -c) || \
-      (echo '${TILE_WEBP_SHA256SUM_03}  tile.webp.1' | ${SHA256SUM_EXECUTABLE} -c) || \
-      (echo '${TILE_WEBP_SHA256SUM_04}  tile.webp.1' | ${SHA256SUM_EXECUTABLE} -c) \
+  # Increment Ports
+  math(EXPR HTTPD0_PORT "${HTTPD0_PORT_BASE} + ${TILE_DIR_INDEX}")
+  math(EXPR HTTPD1_PORT "${HTTPD1_PORT_BASE} + ${TILE_DIR_INDEX}")
+  math(EXPR RENDERD1_PORT "${RENDERD1_PORT_BASE} + ${TILE_DIR_INDEX}")
+
+  set(METRICS_OFF_URL "http://${HTTPD1_HOST}:${HTTPD1_PORT}/metrics")
+  set(METRICS_ON_URL "http://${HTTPD0_HOST}:${HTTPD0_PORT}/metrics")
+  set(MOD_TILE_OFF_URL "http://${HTTPD1_HOST}:${HTTPD1_PORT}/mod_tile")
+  set(MOD_TILE_ON_URL "http://${HTTPD0_HOST}:${HTTPD0_PORT}/mod_tile")
+  set(TILE_DEFAULT_TILEJSON_URL "http://${HTTPD0_HOST}:${HTTPD0_PORT}/tiles/${DEFAULT_MAP_NAME}/tile-layer.json")
+
+  set(HTTPD_CONF "${PROJECT_BINARY_DIR}/tests/conf/httpd_${STORAGE_BACKEND}.conf")
+  set(HTTPD_LOG_ACCESS "${PROJECT_BINARY_DIR}/tests/logs/httpd_access_${STORAGE_BACKEND}.log")
+  set(HTTPD_LOG_ERROR "${PROJECT_BINARY_DIR}/tests/logs/httpd_error_${STORAGE_BACKEND}.log")
+  set(HTTPD_PID "${PROJECT_BINARY_DIR}/tests/run/httpd_${STORAGE_BACKEND}.pid")
+  set(RENDERD0_LOG "${PROJECT_BINARY_DIR}/tests/logs/renderd0_${STORAGE_BACKEND}.log")
+  set(RENDERD0_PID "${PROJECT_BINARY_DIR}/tests/run/renderd0_${STORAGE_BACKEND}.pid")
+  set(RENDERD0_SOCKET "${PROJECT_BINARY_DIR}/tests/run/renderd0_${STORAGE_BACKEND}.sock")
+  set(RENDERD1_LOG "${PROJECT_BINARY_DIR}/tests/logs/renderd1_${STORAGE_BACKEND}.log")
+  set(RENDERD1_PID "${PROJECT_BINARY_DIR}/tests/run/renderd1_${STORAGE_BACKEND}.pid")
+  set(RENDERD2_LOG "${PROJECT_BINARY_DIR}/tests/logs/renderd2_${STORAGE_BACKEND}.log")
+  set(RENDERD2_PID "${PROJECT_BINARY_DIR}/tests/run/renderd2_${STORAGE_BACKEND}.pid")
+  set(RENDERD2_SOCKET "${PROJECT_BINARY_DIR}/tests/run/renderd2_${STORAGE_BACKEND}.sock")
+  set(RENDERD_CONF "${PROJECT_BINARY_DIR}/tests/conf/renderd_${STORAGE_BACKEND}.conf")
+  if(STORAGE_BACKEND STREQUAL "memcached_default")
+    set(MEMCACHED_PORT "11211")
+  else()
+    math(EXPR MEMCACHED_PORT "${MEMCACHED_PORT_BASE} + ${TILE_DIR_INDEX}")
+  endif()
+
+  configure_file(
+    renderd.conf.in
+    ${RENDERD_CONF}
+  )
+
+  configure_file(
+    httpd.conf.in
+    ${HTTPD_CONF}
+  )
+
+  set(SERVICES_START_CMDS
+    "$<TARGET_FILE:renderd> --config ${RENDERD_CONF} --foreground --slave 0 > ${RENDERD0_LOG} 2>&1 &"
+    "printf \${!} > ${RENDERD0_PID}"
+    "$<TARGET_FILE:renderd> --config ${RENDERD_CONF} --foreground --slave 1 > ${RENDERD1_LOG} 2>&1 &"
+    "printf \${!} > ${RENDERD1_PID}"
+    "$<TARGET_FILE:renderd> --config ${RENDERD_CONF} --slave 2"
+    "${HTTPD_EXECUTABLE} -e debug -f ${HTTPD_CONF} -k start"
+  )
+
+  if(STORAGE_BACKEND STREQUAL "memcached_custom" OR STORAGE_BACKEND STREQUAL "memcached_default")
+    list(APPEND SERVICES_START_CMDS
+      "${MEMCACHED_EXECUTABLE} -l ${MEMCACHED_HOST} -p ${MEMCACHED_PORT} -u ${USER_NAME} -vvv \
+        > logs/memcached.log 2>&1 &"
+      "printf \${!} > run/memcached.pid"
    )
-  "
-  WORKING_DIRECTORY tests
-)
-add_test(
-  NAME stats_urls
-  COMMAND ${BASH} -c "
-    METRICS_ON_CMD=\"${CURL_CMD} ${METRICS_ON_URL}\"
-    METRICS_ON_OUTPUT=$(\${METRICS_ON_CMD})
-    echo \"Metrics On output: \${METRICS_ON_OUTPUT}\"
-    MOD_TILE_ON_CMD=\"${CURL_CMD} ${MOD_TILE_ON_URL}\"
-    MOD_TILE_ON_OUTPUT=$(\${MOD_TILE_ON_CMD})
-    echo \"Mod_tile On output: \${MOD_TILE_ON_OUTPUT}\"
-    for LAYER in 'jpg' 'png256' 'png32' 'webp'; do
-      METRICS_LAYER_200=\"modtile_layer_responses_total{layer=\\\"/tiles/\${LAYER}/\\\",status=\\\"200\\\"} 1\"
-      echo \"\${METRICS_LAYER_200}\"
-      if [[ \"\${METRICS_ON_OUTPUT}\" != *\"\${METRICS_LAYER_200}\"* ]]; then
-        exit 1;
-      fi
-      MOD_TILE_LAYER_200=\"NoRes200Layer/tiles/\${LAYER}/: 1\"
-      echo \"\${MOD_TILE_LAYER_200}\"
-      if [[ \"\${MOD_TILE_ON_OUTPUT}\" != *\"\${MOD_TILE_LAYER_200}\"* ]]; then
-        exit 1;
-      fi
-    done
-    METRICS_OFF_OUTPUT=$(${CURL_CMD} ${METRICS_OFF_URL})
-    echo \"Metrics Off output: '\${METRICS_OFF_OUTPUT}'\"
-    if [ \"\${METRICS_OFF_OUTPUT}\" != \"Stats are not enabled for this server\" ]; then
-      exit 1;
-    fi
-    MOD_TILE_OFF_OUTPUT=$(${CURL_CMD} ${MOD_TILE_OFF_URL})
-    echo \"Mod_tile Off output: '\${MOD_TILE_OFF_OUTPUT}'\"
-    if [ \"\${MOD_TILE_OFF_OUTPUT}\" != \"Stats are not enabled for this server\" ]; then
-      exit 1;
-    fi
-  "
-  WORKING_DIRECTORY tests
-)
-add_test(
-  NAME stop_renderd
-  COMMAND ${BASH} -c "${RENDERD_STOP_CMD_STR}"
-  WORKING_DIRECTORY tests
-)
-add_test(
-  NAME stop_httpd
-  COMMAND ${BASH} -c "${HTTPD_STOP_CMD_STR}"
-  WORKING_DIRECTORY tests
-)
-add_test(
-  NAME clear_dirs
-  COMMAND ${BASH} -c "
-    ${RM} -f -r -v logs/* run/* tiles/*
-  "
-  WORKING_DIRECTORY tests
-)
+  endif()

+  string(REPLACE ";" " " MAP_NAMES_STR "${MAP_NAMES}")
+  string(REPLACE ";" "\n" SERVICES_START_CMDS_STR "${SERVICES_START_CMDS}")

-set_tests_properties(create_dirs PROPERTIES
-  FIXTURES_SETUP httpd_started
-)
-set_tests_properties(start_renderd PROPERTIES
-  DEPENDS create_dirs
-  FIXTURES_SETUP httpd_started
-)
-set_tests_properties(start_httpd PROPERTIES
-  DEPENDS create_dirs
-  FIXTURES_SETUP httpd_started
-)
-set_tests_properties(stop_renderd PROPERTIES
-  FIXTURES_CLEANUP httpd_started
-  REQUIRED_FILES "${RENDERD_PIDS}"
-)
-set_tests_properties(stop_httpd PROPERTIES
-  FIXTURES_CLEANUP httpd_started
-  REQUIRED_FILES "${HTTPD_PID}"
-)
-set_tests_properties(clear_dirs PROPERTIES
-  DEPENDS "stop_renderd;stop_httpd"
-  FIXTURES_CLEANUP httpd_started
-  REQUIRED_FILES "logs;run;tiles"
-)
-
-set_tests_properties(render_speedtest PROPERTIES
-  FIXTURES_REQUIRED httpd_started
-  TIMEOUT 60
-)
-set_tests_properties(render_expired PROPERTIES
-  DEPENDS render_speedtest
-  FIXTURES_REQUIRED httpd_started
-  TIMEOUT 60
-)
-set_tests_properties(render_list PROPERTIES
-  DEPENDS render_speedtest
-  FIXTURES_REQUIRED httpd_started
-  TIMEOUT 60
-)
-set_tests_properties(render_old PROPERTIES
-  DEPENDS render_speedtest
-  FIXTURES_REQUIRED httpd_started
-  TIMEOUT 60
-)
-set_tests_properties(check_tiles PROPERTIES
-  FIXTURES_REQUIRED tiles_downloaded
-)
-set_tests_properties(stats_urls PROPERTIES
-  FIXTURES_REQUIRED "httpd_started;tiles_downloaded"
-)
-
-
-if(JQ_EXECUTABLE)
  add_test(
-    NAME tilejson_url
+    NAME create_dirs_${STORAGE_BACKEND}
+    COMMAND ${MKDIR_EXECUTABLE} -p -v logs run tiles
+    WORKING_DIRECTORY tests
+  )
+  set_tests_properties(create_dirs_${STORAGE_BACKEND} PROPERTIES
+    FIXTURES_SETUP services_started_${STORAGE_BACKEND}
+  )
+  add_test(
+    NAME start_services_${STORAGE_BACKEND}
+    COMMAND ${BASH} -c "${SERVICES_START_CMDS_STR}"
+    WORKING_DIRECTORY tests
+  )
+  set_tests_properties(start_services_${STORAGE_BACKEND} PROPERTIES
+    DEPENDS create_dirs
+    FIXTURES_SETUP services_started_${STORAGE_BACKEND}
+  )
+
+  foreach(SOCKET_TYPE sock tcp)
+    if(SOCKET_TYPE STREQUAL "sock")
+      set(SOCKET ${RENDERD0_SOCKET})
+    endif()
+    if(SOCKET_TYPE STREQUAL "tcp")
+      set(SOCKET ${RENDERD1_HOST}:${RENDERD1_PORT})
+    endif()
+
+    add_test(
+      NAME render_expired_${SOCKET_TYPE}_${STORAGE_BACKEND}
+      COMMAND ${BASH} -c "
+        echo '0/0/0' | $<TARGET_FILE:render_expired> \
+          --map ${DEFAULT_MAP_NAME} \
+          --max-zoom 5 \
+          --min-zoom 0 \
+          --no-progress \
+          --num-threads 1 \
+          --socket ${SOCKET} \
+          --tile-dir ${TILE_DIR} \
+          --verbose
+      "
+      WORKING_DIRECTORY tests
+    )
+    set_tests_properties(render_expired_${SOCKET_TYPE}_${STORAGE_BACKEND} PROPERTIES
+      DEPENDS render_speedtest_${SOCKET_TYPE}_${STORAGE_BACKEND}
+      FIXTURES_REQUIRED services_started_${STORAGE_BACKEND}
+      TIMEOUT 60
+    )
+    add_test(
+      NAME render_expired_touch_${SOCKET_TYPE}_${STORAGE_BACKEND}
+      COMMAND ${BASH} -c "
+        echo '0/0/0' | $<TARGET_FILE:render_expired> \
+          --map ${DEFAULT_MAP_NAME} \
+          --max-zoom 5 \
+          --min-zoom 0 \
+          --no-progress \
+          --num-threads 1 \
+          --socket ${SOCKET} \
+          --tile-dir ${TILE_DIR} \
+          --touch-from 0 \
+          --verbose
+      "
+      WORKING_DIRECTORY tests
+    )
+    set_tests_properties(render_expired_touch_${SOCKET_TYPE}_${STORAGE_BACKEND} PROPERTIES
+      DEPENDS render_speedtest_${SOCKET_TYPE}_${STORAGE_BACKEND}
+      FIXTURES_REQUIRED services_started_${STORAGE_BACKEND}
+      TIMEOUT 60
+    )
+    add_test(
+      NAME render_expired_delete_${SOCKET_TYPE}_${STORAGE_BACKEND}
+      COMMAND ${BASH} -c "
+        echo '0/0/0' | $<TARGET_FILE:render_expired> \
+          --delete-from 0 \
+          --map ${DEFAULT_MAP_NAME} \
+          --max-zoom 5 \
+          --min-zoom 0 \
+          --no-progress \
+          --num-threads 1 \
+          --socket ${SOCKET} \
+          --tile-dir ${TILE_DIR} \
+          --verbose
+      "
+      WORKING_DIRECTORY tests
+    )
+    set_tests_properties(render_expired_delete_${SOCKET_TYPE}_${STORAGE_BACKEND} PROPERTIES
+      DEPENDS render_speedtest_${SOCKET_TYPE}_${STORAGE_BACKEND}
+      FIXTURES_REQUIRED services_started_${STORAGE_BACKEND}
+      TIMEOUT 60
+    )
+    add_test(
+      NAME render_list_${SOCKET_TYPE}_${STORAGE_BACKEND}
+      COMMAND ${BASH} -c "
+        $<TARGET_FILE:render_list> \
+          --all \
+          --force \
+          --map ${DEFAULT_MAP_NAME} \
+          --max-zoom 5 \
+          --min-zoom 0 \
+          --num-threads 1 \
+          --socket ${SOCKET} \
+          --tile-dir ${TILE_DIR} \
+          --verbose
+      "
+      WORKING_DIRECTORY tests
+    )
+    set_tests_properties(render_list_${SOCKET_TYPE}_${STORAGE_BACKEND} PROPERTIES
+      DEPENDS render_speedtest_${SOCKET_TYPE}_${STORAGE_BACKEND}
+      FIXTURES_REQUIRED services_started_${STORAGE_BACKEND}
+      TIMEOUT 60
+    )
+    add_test(
+      NAME render_list_stdin_${SOCKET_TYPE}_${STORAGE_BACKEND}
+      COMMAND ${BASH} -c "
+        echo '0 0 0' | $<TARGET_FILE:render_list> \
+          --force \
+          --map ${DEFAULT_MAP_NAME} \
+          --max-zoom 5 \
+          --min-zoom 0 \
+          --num-threads 1 \
+          --socket ${SOCKET} \
+          --tile-dir ${TILE_DIR} \
+          --verbose
+      "
+      WORKING_DIRECTORY tests
+    )
+    set_tests_properties(render_list_stdin_${SOCKET_TYPE}_${STORAGE_BACKEND} PROPERTIES
+      DEPENDS render_speedtest_${SOCKET_TYPE}_${STORAGE_BACKEND}
+      FIXTURES_REQUIRED services_started_${STORAGE_BACKEND}
+      TIMEOUT 60
+    )
+    add_test(
+      NAME render_old_${SOCKET_TYPE}_${STORAGE_BACKEND}
+      COMMAND ${BASH} -c "
+        ${TOUCH_EXECUTABLE} -d '+1 month' ${PROJECT_BINARY_DIR}/tests/tiles/planet-import-complete
+        $<TARGET_FILE:render_old> \
+          --config ${RENDERD_CONF} \
+          --map ${DEFAULT_MAP_NAME} \
+          --max-zoom 5 \
+          --min-zoom 0 \
+          --num-threads 1 \
+          --socket ${SOCKET} \
+          --tile-dir ${TILE_DIR} \
+          --verbose
+      "
+      WORKING_DIRECTORY tests
+    )
+    set_tests_properties(render_old_${SOCKET_TYPE}_${STORAGE_BACKEND} PROPERTIES
+      DEPENDS render_speedtest_${SOCKET_TYPE}_${STORAGE_BACKEND}
+      FIXTURES_REQUIRED services_started_${STORAGE_BACKEND}
+      TIMEOUT 60
+    )
+    add_test(
+      NAME render_speedtest_${SOCKET_TYPE}_${STORAGE_BACKEND}
+      COMMAND ${BASH} -c "
+        $<TARGET_FILE:render_speedtest> \
+          --map ${DEFAULT_MAP_NAME} \
+          --max-zoom 10 \
+          --min-zoom 0 \
+          --num-threads 1 \
+          --socket ${SOCKET}
+      "
+      WORKING_DIRECTORY tests
+    )
+    set_tests_properties(render_speedtest_${SOCKET_TYPE}_${STORAGE_BACKEND} PROPERTIES
+      FIXTURES_REQUIRED services_started_${STORAGE_BACKEND}
+      TIMEOUT 60
+    )
+  endforeach()
+
+  foreach(MAP_NAME IN LISTS MAP_NAMES)
+    string(REGEX REPLACE "[0-9]+" "" EXTENSION ${MAP_NAME})
+    set(TILE_PATH "/tiles/${MAP_NAME}/${TILE_ZXY}.${EXTENSION}")
+    set(HTTPD0_URL "http://${HTTPD0_HOST}:${HTTPD0_PORT}${TILE_PATH}")
+    set(HTTPD1_URL "http://${HTTPD1_HOST}:${HTTPD1_PORT}${TILE_PATH}")
+    add_test(
+      NAME download_tile_${MAP_NAME}_${STORAGE_BACKEND}
+      COMMAND ${BASH} -c "
+        until $(${CURL_CMD} ${HTTPD0_URL} --output tile.${MAP_NAME}.0); do
+          echo 'Sleeping 1s (${MAP_NAME}.0)';
+          sleep 1;
+        done
+        until $(${CURL_CMD} ${HTTPD1_URL} --output tile.${MAP_NAME}.1); do
+          echo 'Sleeping 1s (${MAP_NAME}.1)';
+          sleep 1;
+        done
+      "
+      WORKING_DIRECTORY tests
+    )
+    set_tests_properties(download_tile_${MAP_NAME}_${STORAGE_BACKEND} PROPERTIES
+      FIXTURES_REQUIRED services_started_${STORAGE_BACKEND}
+      FIXTURES_SETUP tiles_downloaded_${STORAGE_BACKEND}
+      TIMEOUT 10
+    )
+    add_test(
+      NAME status_and_dirty_${MAP_NAME}_${STORAGE_BACKEND}
+      COMMAND ${BASH} -c "
+        TILE_DIRTY_ON_CMD=\"${CURL_CMD} ${HTTPD0_URL}/dirty\"
+        TILE_STATUS_ON_CMD=\"${CURL_CMD} ${HTTPD0_URL}/status\"
+        TILE_LAST_RENDERED_AT_OLD=$(\${TILE_STATUS_ON_CMD} | ${GREP_EXECUTABLE} -o 'Last rendered at [^\\.]*.')
+        echo \"Tile Last Rendered At (Old): \${TILE_LAST_RENDERED_AT_OLD}\"
+        sleep 1
+        TILE_DIRTY_ON_OUTPUT=$(\${TILE_DIRTY_ON_CMD})
+        echo \"Dirty: \${TILE_DIRTY_ON_OUTPUT}\"
+        if [ \"\${TILE_DIRTY_ON_OUTPUT}\" != \"Tile submitted for rendering\" ]; then
+          exit 1;
+        fi
+        TILE_LAST_RENDERED_AT_NEW=$(\${TILE_STATUS_ON_CMD} | ${GREP_EXECUTABLE} -o 'Last rendered at [^\\.]*.')
+        echo \"Tile Last Rendered At (New): \${TILE_LAST_RENDERED_AT_NEW}\"
+        until [ \"\${TILE_LAST_RENDERED_AT_OLD}\" != \"\${TILE_LAST_RENDERED_AT_NEW}\" ]; do
+          echo 'Sleeping 1s';
+          sleep 1;
+          TILE_LAST_RENDERED_AT_NEW=$(\${TILE_STATUS_ON_CMD} | ${GREP_EXECUTABLE} -o 'Last rendered at [^\\.]*.');
+          echo \"Tile Last Rendered At (New): \${TILE_LAST_RENDERED_AT_NEW}\";
+        done
+        TILE_DIRTY_OFF_CODE=$(${CURL_CMD} --write-out '%{http_code}' ${HTTPD1_URL}/dirty)
+        echo \"Dirty Off code: '\${TILE_DIRTY_OFF_CODE}'\"
+        if [ \"\${TILE_DIRTY_OFF_CODE}\" != \"404\" ]; then
+          exit 1;
+        fi
+        TILE_STATUS_OFF_CODE=$(${CURL_CMD} --write-out '%{http_code}' ${HTTPD1_URL}/status)
+        echo \"Status Off code: '\${TILE_STATUS_OFF_CODE}'\"
+        if [ \"\${TILE_STATUS_OFF_CODE}\" != \"404\" ]; then
+          exit 1;
+        fi
+      "
+      WORKING_DIRECTORY tests
+    )
+    set_tests_properties(status_and_dirty_${MAP_NAME}_${STORAGE_BACKEND} PROPERTIES
+      DEPENDS_ON download_tile_${MAP_NAME}_${STORAGE_BACKEND}
+      FIXTURES_REQUIRED services_started_${STORAGE_BACKEND}
+      TIMEOUT 20
+    )
+    add_test(
+      NAME remove_tile_${MAP_NAME}_${STORAGE_BACKEND}
+      COMMAND ${RM} -v tile.${MAP_NAME}.0 tile.${MAP_NAME}.1
+      WORKING_DIRECTORY tests
+    )
+    set_tests_properties(remove_tile_${MAP_NAME}_${STORAGE_BACKEND} PROPERTIES
+      DEPENDS_ON download_tile_${MAP_NAME}_${STORAGE_BACKEND}
+      FIXTURES_CLEANUP tiles_downloaded_${STORAGE_BACKEND}
+      REQUIRED_FILES "tile.${MAP_NAME}.0;tile.${MAP_NAME}.1"
+    )
+  endforeach()
+
+  add_test(
+    NAME check_tiles_${STORAGE_BACKEND}
    COMMAND ${BASH} -c "
-      TILE_DEFAULT_TILEJSON_CMD=\"${CURL_CMD} ${TILE_DEFAULT_TILEJSON_URL}\"
-      TILE_DEFAULT_TILEJSON_OUTPUT=$(\${TILE_DEFAULT_TILEJSON_CMD})
-      TILE_DEFAULT_TILEJSON_VERSION=$(echo \"\${TILE_DEFAULT_TILEJSON_OUTPUT}\" | ${JQ_EXECUTABLE} -r .tilejson)
-      if [ \"\${TILE_DEFAULT_TILEJSON_VERSION}\" != \"2.0.0\" ]; then
+      (echo '${TILE_JPG_SHA256SUM}  tile.jpg.0' | ${SHA256SUM_EXECUTABLE} -c) && \
+      (echo '${TILE_JPG_SHA256SUM}  tile.jpg.1' | ${SHA256SUM_EXECUTABLE} -c) && \
+      (echo '${TILE_PNG256_SHA256SUM}  tile.png256.0' | ${SHA256SUM_EXECUTABLE} -c) && \
+      (echo '${TILE_PNG256_SHA256SUM}  tile.png256.1' | ${SHA256SUM_EXECUTABLE} -c) && \
+      (echo '${TILE_PNG32_SHA256SUM}  tile.png32.0' | ${SHA256SUM_EXECUTABLE} -c) && \
+      (echo '${TILE_PNG32_SHA256SUM}  tile.png32.1' | ${SHA256SUM_EXECUTABLE} -c) && \
+      ( \
+        (echo '${TILE_WEBP_SHA256SUM_01}  tile.webp.0' | ${SHA256SUM_EXECUTABLE} -c) || \
+        (echo '${TILE_WEBP_SHA256SUM_02}  tile.webp.0' | ${SHA256SUM_EXECUTABLE} -c) || \
+        (echo '${TILE_WEBP_SHA256SUM_03}  tile.webp.0' | ${SHA256SUM_EXECUTABLE} -c) || \
+        (echo '${TILE_WEBP_SHA256SUM_04}  tile.webp.0' | ${SHA256SUM_EXECUTABLE} -c) \
+      ) && \
+      ( \
+        (echo '${TILE_WEBP_SHA256SUM_01}  tile.webp.1' | ${SHA256SUM_EXECUTABLE} -c) || \
+        (echo '${TILE_WEBP_SHA256SUM_02}  tile.webp.1' | ${SHA256SUM_EXECUTABLE} -c) || \
+        (echo '${TILE_WEBP_SHA256SUM_03}  tile.webp.1' | ${SHA256SUM_EXECUTABLE} -c) || \
+        (echo '${TILE_WEBP_SHA256SUM_04}  tile.webp.1' | ${SHA256SUM_EXECUTABLE} -c) \
+      )
+    "
+    WORKING_DIRECTORY tests
+  )
+  set_tests_properties(check_tiles_${STORAGE_BACKEND} PROPERTIES
+    FIXTURES_REQUIRED tiles_downloaded_${STORAGE_BACKEND}
+  )
+  add_test(
+    NAME stats_urls_${STORAGE_BACKEND}
+    COMMAND ${BASH} -c "
+      METRICS_ON_CMD=\"${CURL_CMD} ${METRICS_ON_URL}\"
+      METRICS_ON_OUTPUT=$(\${METRICS_ON_CMD})
+      echo \"Metrics On output: \${METRICS_ON_OUTPUT}\"
+      MOD_TILE_ON_CMD=\"${CURL_CMD} ${MOD_TILE_ON_URL}\"
+      MOD_TILE_ON_OUTPUT=$(\${MOD_TILE_ON_CMD})
+      echo \"Mod_tile On output: \${MOD_TILE_ON_OUTPUT}\"
+      for LAYER in ${MAP_NAMES_STR}; do
+        METRICS_LAYER_200=\"modtile_layer_responses_total{layer=\\\"/tiles/\${LAYER}/\\\",status=\\\"200\\\"} 1\"
+        echo \"\${METRICS_LAYER_200}\";
+        if [[ \"\${METRICS_ON_OUTPUT}\" != *\"\${METRICS_LAYER_200}\"* ]]; then
+          exit 1;
+        fi
+        MOD_TILE_LAYER_200=\"NoRes200Layer/tiles/\${LAYER}/: 1\"
+        echo \"\${MOD_TILE_LAYER_200}\";
+        if [[ \"\${MOD_TILE_ON_OUTPUT}\" != *\"\${MOD_TILE_LAYER_200}\"* ]]; then
+          exit 1;
+        fi
+      done
+      METRICS_OFF_OUTPUT=$(${CURL_CMD} ${METRICS_OFF_URL})
+      echo \"Metrics Off output: '\${METRICS_OFF_OUTPUT}'\";
+      if [ \"\${METRICS_OFF_OUTPUT}\" != \"Stats are not enabled for this server\" ]; then
+        exit 1;
+      fi
+      MOD_TILE_OFF_OUTPUT=$(${CURL_CMD} ${MOD_TILE_OFF_URL})
+      echo \"Mod_tile Off output: '\${MOD_TILE_OFF_OUTPUT}'\";
+      if [ \"\${MOD_TILE_OFF_OUTPUT}\" != \"Stats are not enabled for this server\" ]; then
        exit 1;
      fi
    "
    WORKING_DIRECTORY tests
  )
-  set_tests_properties(tilejson_url PROPERTIES
-    FIXTURES_REQUIRED httpd_started
+  set_tests_properties(stats_urls_${STORAGE_BACKEND} PROPERTIES
+    FIXTURES_REQUIRED "services_started_${STORAGE_BACKEND};tiles_downloaded_${STORAGE_BACKEND}"
  )
-endif()
+  add_test(
+    NAME stop_services_${STORAGE_BACKEND}
+    COMMAND ${BASH} -c "
+      for SERVICE_PID_FILE in run/*.pid; do
+        ${KILL_EXECUTABLE} $(${CAT_EXECUTABLE} \${SERVICE_PID_FILE});
+        ${RM} \${SERVICE_PID_FILE};
+        sleep 1;
+      done
+    "
+    WORKING_DIRECTORY tests
+  )
+  set_tests_properties(stop_services_${STORAGE_BACKEND} PROPERTIES
+    FIXTURES_CLEANUP services_started_${STORAGE_BACKEND}
+  )
+  add_test(
+    NAME clear_dirs_${STORAGE_BACKEND}
+    COMMAND ${BASH} -c "
+      ${RM} -f -r -v logs/* run/* tiles/*
+    "
+    WORKING_DIRECTORY tests
+  )
+  set_tests_properties(clear_dirs_${STORAGE_BACKEND} PROPERTIES
+    DEPENDS stop_services_${STORAGE_BACKEND}
+    FIXTURES_CLEANUP services_started_${STORAGE_BACKEND}
+    REQUIRED_FILES "logs;run;tiles"
+  )
+
+  if(STORAGE_BACKEND STREQUAL "file")
+    add_test(
+      NAME download_tile_parameterization_${STORAGE_BACKEND}
+      COMMAND ${BASH} -c "
+        TILE_PATH=\"/tiles/${DEFAULT_MAP_NAME}/en,de,_/${TILE_ZXY}.png\"
+        until ${CURL_CMD} \"http://${HTTPD0_HOST}:${HTTPD0_PORT}\${TILE_PATH}\"; do
+          echo 'Sleeping 1s (${DEFAULT_MAP_NAME}/en,de,_/${TILE_ZXY}.png.0)';
+          sleep 1;
+        done
+        until ${CURL_CMD} \"http://${HTTPD1_HOST}:${HTTPD1_PORT}\${TILE_PATH}\"; do
+        echo 'Sleeping 1s (${DEFAULT_MAP_NAME}/en,de,_/${TILE_ZXY}.png.1)';
+          sleep 1;
+        done
+      "
+      WORKING_DIRECTORY tests
+    )
+    set_tests_properties(download_tile_parameterization_${STORAGE_BACKEND} PROPERTIES
+      FIXTURES_REQUIRED services_started_${STORAGE_BACKEND}
+      TIMEOUT 10
+    )
+  endif()
+
+  if(JQ_EXECUTABLE)
+    add_test(
+      NAME tilejson_url_${STORAGE_BACKEND}
+      COMMAND ${BASH} -c "
+        TILE_DEFAULT_TILEJSON_CMD=\"${CURL_CMD} ${TILE_DEFAULT_TILEJSON_URL}\"
+        TILE_DEFAULT_TILEJSON_OUTPUT=$(\${TILE_DEFAULT_TILEJSON_CMD})
+        TILE_DEFAULT_TILEJSON_VERSION=$(echo \"\${TILE_DEFAULT_TILEJSON_OUTPUT}\" | ${JQ_EXECUTABLE} -r .tilejson)
+        if [ \"\${TILE_DEFAULT_TILEJSON_VERSION}\" != \"2.0.0\" ]; then
+          exit 1;
+        fi
+      "
+      WORKING_DIRECTORY tests
+    )
+    set_tests_properties(tilejson_url_${STORAGE_BACKEND} PROPERTIES
+      FIXTURES_REQUIRED services_started_${STORAGE_BACKEND}
+    )
+  endif()
+endforeach()
--- a/tests/httpd.conf.in
+++ b/tests/httpd.conf.in
@ -15,7 +15,7 @@ Redirect /renderd-example-map/leaflet/leaflet.min.js https://unpkg.com/leaflet/d
 </IfModule>

 <VirtualHost @HTTPD0_HOST@:@HTTPD0_PORT@>
-  LoadTileConfigFile @PROJECT_BINARY_DIR@/tests/conf/renderd.conf
+  LoadTileConfigFile @RENDERD_CONF@
  ModTileBulkMode Off
  ModTileCacheDurationDirty 900
  ModTileCacheDurationLowZoom 9 518400
@ -31,15 +31,15 @@ Redirect /renderd-example-map/leaflet/leaflet.min.js https://unpkg.com/leaflet/d
  ModTileMaxLoadMissing 5
  ModTileMaxLoadOld 2
  ModTileMissingRequestTimeout 10
-  ModTileRenderdSocketName @PROJECT_BINARY_DIR@/tests/run/renderd0.sock
+  ModTileRenderdSocketName @RENDERD0_SOCKET@
  ModTileRequestTimeout 3
  ModTileThrottlingRenders 128 0.2
  ModTileThrottlingTiles 10000 1
-  ModTileTileDir @PROJECT_BINARY_DIR@/tests/tiles
+  ModTileTileDir @TILE_DIR@
 </VirtualHost>

 <VirtualHost @HTTPD1_HOST@:@HTTPD1_PORT@>
-  LoadTileConfigFile @PROJECT_BINARY_DIR@/tests/conf/renderd.conf
+  LoadTileConfigFile @RENDERD_CONF@
  ModTileBulkMode Off
  ModTileCacheDurationDirty 900
  ModTileCacheDurationLowZoom 9 518400
@ -59,16 +59,16 @@ Redirect /renderd-example-map/leaflet/leaflet.min.js https://unpkg.com/leaflet/d
  ModTileRequestTimeout 3
  ModTileThrottlingRenders 128 0.2
  ModTileThrottlingTiles 10000 1
-  ModTileTileDir @PROJECT_BINARY_DIR@/tests/tiles
+  ModTileTileDir @TILE_DIR@
 </VirtualHost>

-CustomLog logs/access_log "%h %l %u %t \"%r\" %>s %b"
-ErrorLog logs/error_log
+CustomLog @HTTPD_LOG_ACCESS@ "%h %l %u %t \"%r\" %>s %b"
+ErrorLog @HTTPD_LOG_ERROR@
 Group @WWW_GROUP_NAME@
 Listen @HTTPD0_PORT@
 Listen @HTTPD1_PORT@
 LogLevel debug
-PidFile run/httpd.pid
+PidFile @HTTPD_PID@
 ServerName localhost
 ServerRoot @PROJECT_BINARY_DIR@/tests
 User @WWW_USER_NAME@
--- a/tests/renderd.conf.in
+++ b/tests/renderd.conf.in
@ -4,44 +4,51 @@ font_dir_recurse=@MAPNIK_FONTS_DIR_RECURSE@
 plugins_dir=@MAPNIK_PLUGINS_DIR@

 [@DEFAULT_MAP_NAME@]
-HTCPHOST=@HTTPD0_HOST@
-TILEDIR=@PROJECT_BINARY_DIR@/tests/tiles
-URI=/tiles/@DEFAULT_MAP_NAME@
+HOST=@HTTPD0_HOST@
+HTCPHOST=@HTTPD1_HOST@
+PARAMETERIZE_STYLE=language
+TILEDIR=@TILE_DIR@
+URI=/tiles/@DEFAULT_MAP_NAME@/
 XML=@PROJECT_SOURCE_DIR@/utils/example-map/mapnik.xml

 [jpg]
-TILEDIR=@PROJECT_BINARY_DIR@/tests/tiles
+TILEDIR=@TILE_DIR@
 TYPE=jpg image/jpeg jpeg
-URI=/tiles/jpg
+URI=/tiles/jpg/
 XML=@PROJECT_SOURCE_DIR@/utils/example-map/mapnik.xml

 [png256]
-TILEDIR=@PROJECT_BINARY_DIR@/tests/tiles
+TILEDIR=@TILE_DIR@
 TYPE=png image/png png256
-URI=/tiles/png256
+URI=/tiles/png256/
 XML=@PROJECT_SOURCE_DIR@/utils/example-map/mapnik.xml

 [png32]
-TILEDIR=@PROJECT_BINARY_DIR@/tests/tiles
+TILEDIR=@TILE_DIR@
 TYPE=png image/png png32
-URI=/tiles/png32
+URI=/tiles/png32/
 XML=@PROJECT_SOURCE_DIR@/utils/example-map/mapnik.xml

 [webp]
-TILEDIR=@PROJECT_BINARY_DIR@/tests/tiles
+TILEDIR=@TILE_DIR@
 TYPE=webp image/webp webp
-URI=/tiles/webp
+URI=/tiles/webp/
 XML=@PROJECT_SOURCE_DIR@/utils/example-map/mapnik.xml

 [renderd1]
 iphostname=@RENDERD1_HOST@
 ipport=@RENDERD1_PORT@
-pid_file=@PROJECT_BINARY_DIR@/tests/run/renderd1.pid
-stats_file=@PROJECT_BINARY_DIR@/tests/run/renderd1.stats
-tile_dir=@PROJECT_BINARY_DIR@/tests/tiles
+pid_file=@RENDERD1_PID@
+stats_file=@PROJECT_BINARY_DIR@/tests/run/renderd1_@STORAGE_BACKEND@.stats
+tile_dir=@TILE_DIR@

 [renderd0]
-pid_file=@PROJECT_BINARY_DIR@/tests/run/renderd0.pid
-socketname=@PROJECT_BINARY_DIR@/tests/run/renderd0.sock
-stats_file=@PROJECT_BINARY_DIR@/tests/run/renderd0.stats
-tile_dir=@PROJECT_BINARY_DIR@/tests/tiles
+pid_file=@RENDERD0_PID@
+socketname=@RENDERD0_SOCKET@
+stats_file=@PROJECT_BINARY_DIR@/tests/run/renderd0_@STORAGE_BACKEND@.stats
+tile_dir=@TILE_DIR@
+
+[renderd2]
+pid_file=@RENDERD2_PID@
+socketname=@RENDERD2_SOCKET@
+tile_dir=@TILE_DIR@