@@ -25,6 +25,7 @@ find_program(ID_EXECUTABLE NAMES id REQUIRED)
2525find_program (KILL_EXECUTABLE NAMES kill REQUIRED )
2626find_program (MKDIR_EXECUTABLE NAMES mkdir REQUIRED )
2727find_program (SHA256SUM_EXECUTABLE NAMES gsha256sum sha256sum REQUIRED )
28+ find_program (TOUCH_EXECUTABLE NAMES gtouch touch REQUIRED )
2829
2930if (LibMapnik_VERSION STRLESS "4" )
3031 find_program (MAPNIK_CONFIG_EXECUTABLE NAMES mapnik-config REQUIRED )
@@ -119,6 +120,46 @@ add_test(
119120 NAME render_speedtest
120121 COMMAND render_speedtest --map ${MAP_NAME} --max-zoom 10 --socket ${PROJECT_BINARY_DIR} /tests/run/renderd.sock
121122)
123+ add_test (
124+ NAME render_expired
125+ COMMAND ${BASH} -c "
126+ echo '0/0/0' | ${PROJECT_BINARY_DIR} /src/render_expired \
127+ --map ${MAP_NAME} \
128+ --max-zoom 5 \
129+ --min-zoom 0 \
130+ --num-threads 1 \
131+ --socket ${PROJECT_BINARY_DIR} /tests/run/renderd.sock \
132+ --tile-dir ${PROJECT_BINARY_DIR} /tests/tiles
133+ "
134+ )
135+ add_test (
136+ NAME render_list
137+ COMMAND ${BASH} -c "
138+ ${PROJECT_BINARY_DIR} /src/render_list \
139+ --all \
140+ --force \
141+ --map ${MAP_NAME} \
142+ --max-zoom 5 \
143+ --min-zoom 0 \
144+ --num-threads 1 \
145+ --socket ${PROJECT_BINARY_DIR} /tests/run/renderd.sock \
146+ --tile-dir ${PROJECT_BINARY_DIR} /tests/tiles
147+ "
148+ )
149+ add_test (
150+ NAME render_old
151+ COMMAND ${BASH} -c "
152+ ${TOUCH_EXECUTABLE} -d '+1 month' ${PROJECT_BINARY_DIR} /tests/tiles/planet-import-complete
153+ ${PROJECT_BINARY_DIR} /src/render_old \
154+ --config ${PROJECT_BINARY_DIR} /tests/conf/renderd.conf \
155+ --map ${MAP_NAME} \
156+ --max-zoom 5 \
157+ --min-zoom 0 \
158+ --num-threads 1 \
159+ --socket ${PROJECT_BINARY_DIR} /tests/run/renderd.sock \
160+ --tile-dir ${PROJECT_BINARY_DIR} /tests/tiles
161+ "
162+ )
122163add_test (
123164 NAME download_tile
124165 COMMAND ${BASH} -c "
@@ -204,6 +245,21 @@ set_tests_properties(render_speedtest PROPERTIES
204245 FIXTURES_REQUIRED httpd_started
205246 TIMEOUT 60
206247)
248+ set_tests_properties (render_expired PROPERTIES
249+ DEPENDS render_speedtest
250+ FIXTURES_REQUIRED httpd_started
251+ TIMEOUT 20
252+ )
253+ set_tests_properties (render_list PROPERTIES
254+ DEPENDS render_speedtest
255+ FIXTURES_REQUIRED httpd_started
256+ TIMEOUT 20
257+ )
258+ set_tests_properties (render_old PROPERTIES
259+ DEPENDS render_speedtest
260+ FIXTURES_REQUIRED httpd_started
261+ TIMEOUT 20
262+ )
207263set_tests_properties (download_tile PROPERTIES
208264 FIXTURES_REQUIRED httpd_started
209265 FIXTURES_SETUP tile_downloaded
0 commit comments