Add renderd_config.c usage into render_* targets (#400)

* Add support for reading `renderd.conf` to `render_expired` * Add support for reading `renderd.conf` to `render_list` * Add support for reading `renderd.conf` to `render_old` * Add support for reading `renderd.conf` to `render_speedtest` * Move renderd/render_* execution tests to own files * Reduce variable scope & minor clean up * Use `stat` rather than `access` to check if file exists
openstreetmap · Mar 4, 2024 · 7389b16 · 7389b16
1 parent d5534bd
commit 7389b16
Show file tree

Hide file tree

Showing 21 changed files with 2,271 additions and 1,027 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -4,6 +4,7 @@
 !docs/man
 !etc/apache2/renderd-example-map.conf
 !etc/apache2/tile.load.in
+!etc/renderd/renderd.conf.examples
 !etc/renderd/renderd.conf.in
 !includes
 !src

diff --git a/Makefile.am b/Makefile.am
@@ -24,7 +24,13 @@ bin_PROGRAMS = \
 	render_list \
 	render_old \
 	render_speedtest
-noinst_PROGRAMS = gen_tile_test
+noinst_PROGRAMS = \
+	gen_tile_test \
+	renderd_test \
+	render_expired_test \
+	render_list_test \
+	render_old_test \
+	render_speedtest_test
 
 man_MANS = \
 	docs/man/renderd.1 \
@@ -57,49 +63,82 @@ render_speedtest_SOURCES = \
 	src/g_logger.c \
 	src/protocol_helper.c \
 	src/render_submit_queue.c \
+	src/renderd_config.c \
 	src/sys_utils.c
-render_speedtest_LDADD = $(PTHREAD_CFLAGS) $(GLIB_LIBS)
+render_speedtest_LDADD = $(PTHREAD_CFLAGS) $(GLIB_LIBS) $(INIPARSER_LDFLAGS)
 
 render_list_SOURCES = \
 	src/render_list.c \
 	src/protocol_helper.c \
 	src/render_submit_queue.c \
+	src/renderd_config.c \
 	src/sys_utils.c \
 	$(STORE_SOURCES)
-render_list_LDADD = $(PTHREAD_CFLAGS) $(STORE_LDFLAGS)
+render_list_LDADD = $(PTHREAD_CFLAGS) $(STORE_LDFLAGS) $(INIPARSER_LDFLAGS)
 
 render_expired_SOURCES = \
 	src/render_expired.c \
 	src/protocol_helper.c \
 	src/render_submit_queue.c \
+	src/renderd_config.c \
 	src/sys_utils.c \
 	$(STORE_SOURCES)
-render_expired_LDADD = $(PTHREAD_CFLAGS) $(STORE_LDFLAGS)
+render_expired_LDADD = $(PTHREAD_CFLAGS) $(STORE_LDFLAGS) $(INIPARSER_LDFLAGS)
 
 render_old_SOURCES = \
 	src/render_old.c \
 	src/g_logger.c \
 	src/protocol_helper.c \
 	src/render_submit_queue.c \
+	src/renderd_config.c \
 	src/store_file_utils.c \
 	src/sys_utils.c
-render_old_LDADD = $(PTHREAD_CFLAGS) $(GLIB_LIBS)
+render_old_LDADD = $(PTHREAD_CFLAGS) $(GLIB_LIBS) $(INIPARSER_LDFLAGS)
 
 #convert_meta_SOURCES = src/dir_utils.c src/store.c src/convert_meta.c
 
+noinst_LIBRARIES = catch_main.o catch_test_common.o
+catch_main_o_SOURCES = tests/catch/catch_main.cpp
+catch_test_common_o_SOURCES = tests/catch/catch_test_common.cpp
+
 gen_tile_test_SOURCES = \
 	tests/gen_tile_test.cpp \
 	$(renderd_SOURCES)
 gen_tile_test_CFLAGS = -DMAIN_ALREADY_DEFINED
 gen_tile_test_CXXFLAGS = $(renderd_CXXFLAGS)
-gen_tile_test_LDADD = $(renderd_LDADD)
+gen_tile_test_LDADD = $(renderd_LDADD) catch_test_common.o
+
+renderd_test_SOURCES = \
+	tests/renderd_test.cpp
+renderd_test_LDADD = $(GLIB_LIBS) catch_main.o catch_test_common.o
+
+render_expired_test_SOURCES = \
+	tests/render_expired_test.cpp
+render_expired_test_LDADD = $(GLIB_LIBS) catch_main.o catch_test_common.o
+
+render_list_test_SOURCES = \
+	tests/render_list_test.cpp
+render_list_test_LDADD = $(GLIB_LIBS) catch_main.o catch_test_common.o
+
+render_old_test_SOURCES = \
+	tests/render_old_test.cpp
+render_old_test_LDADD = $(GLIB_LIBS) catch_main.o catch_test_common.o
+
+render_speedtest_test_SOURCES = \
+	tests/render_speedtest_test.cpp
+render_speedtest_test_LDADD = $(GLIB_LIBS) catch_main.o catch_test_common.o
 
 CLEANFILES=*.slo mod_tile.la stderr.out src/*.slo src/*.lo src/.libs/* src/*.la
 
 COMMA=,
 
-test: gen_tile_test
+test: gen_tile_test renderd_test render_expired_test render_list_test render_old_test render_speedtest_test
 	./gen_tile_test
+	./renderd_test
+	./render_expired_test
+	./render_list_test
+	./render_old_test
+	./render_speedtest_test
 
 all-local:
 	$(APXS) -c $(DEF_LDLIBS) $(AM_CFLAGS) \

diff --git a/docker/centos/stream/Dockerfile.autotools b/docker/centos/stream/Dockerfile.autotools
@@ -135,7 +135,7 @@ RUN export DESTDIR=/tmp/mod_tile && \
     ./autogen.sh && \
     ./configure && \
     make DESTDIR=${DESTDIR} install install-mod_tile
-RUN ./gen_tile_test
+RUN make test
 
 # Runner
 FROM quay.io/centos/centos:stream${centos_stream_version} as runner

diff --git a/docker/debian/Dockerfile.autotools b/docker/debian/Dockerfile.autotools
@@ -36,7 +36,7 @@ RUN export DESTDIR=/tmp/mod_tile && \
     ./autogen.sh && \
     ./configure && \
     make DESTDIR=${DESTDIR} install install-mod_tile
-RUN ./gen_tile_test
+RUN make test
 
 # Runner
 FROM debian:${debian_version} as runner

diff --git a/docker/ubuntu/Dockerfile.autotools b/docker/ubuntu/Dockerfile.autotools
@@ -36,7 +36,7 @@ RUN export DESTDIR=/tmp/mod_tile && \
     ./autogen.sh && \
     ./configure && \
     make DESTDIR=${DESTDIR} install install-mod_tile
-RUN ./gen_tile_test
+RUN make test
 
 # Runner
 FROM ubuntu:${ubuntu_version} as runner

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -87,9 +87,11 @@ set(render_expired_SRCS
   protocol_helper.c
   render_expired.c
   render_submit_queue.c
+  renderd_config.c
 )
 set(render_expired_LIBS
   ${COMMON_LIBRARIES}
+  ${INIPARSER_LIBRARIES}
   ${STORE_LIBRARIES}
 )
 add_executable(render_expired ${render_expired_SRCS})
@@ -107,9 +109,11 @@ set(render_list_SRCS
   protocol_helper.c
   render_list.c
   render_submit_queue.c
+  renderd_config.c
 )
 set(render_list_LIBS
   ${COMMON_LIBRARIES}
+  ${INIPARSER_LIBRARIES}
   ${STORE_LIBRARIES}
 )
 add_executable(render_list ${render_list_SRCS})
@@ -126,10 +130,12 @@ set(render_old_SRCS
   protocol_helper.c
   render_old.c
   render_submit_queue.c
+  renderd_config.c
   store_file_utils.c
 )
 set(render_old_LIBS
   ${COMMON_LIBRARIES}
+  ${INIPARSER_LIBRARIES}
 )
 add_executable(render_old ${render_old_SRCS})
 target_link_libraries(render_old ${render_old_LIBS})
@@ -145,9 +151,11 @@ set(render_speedtest_SRCS
   protocol_helper.c
   render_speedtest.cpp
   render_submit_queue.c
+  renderd_config.c
 )
 set(render_speedtest_LIBS
   ${COMMON_LIBRARIES}
+  ${INIPARSER_LIBRARIES}
 )
 add_executable(render_speedtest ${render_speedtest_SRCS})
 target_link_libraries(render_speedtest ${render_speedtest_LIBS})
@@ -195,6 +203,7 @@ if(ENABLE_TESTS)
 #-----------------------------------------------------------------------------
 
 set(gen_tile_test_SRCS
+  $<TARGET_OBJECTS:catch_test_common_o>
   ${renderd_SRCS}
   ${PROJECT_SOURCE_DIR}/tests/gen_tile_test.cpp
 )