Coverage improvements (#385)

* Omit includes directory from coverage * Use MAPNIK_{MAJOR,MINOR,PATCH}_VERSION for ease of reability * Cleaning up tests
openstreetmap · Feb 4, 2024 · 460efcc · 460efcc
1 parent 6d00447
commit 460efcc
Show file tree

Hide file tree

Showing 5 changed files with 263 additions and 189 deletions.
diff --git a/.github/actions/coverage/action.yml b/.github/actions/coverage/action.yml
@@ -16,7 +16,7 @@ runs:
         lcov ${{ inputs.lcov-extra-options }} \
           --output-file coverage.info \
           --remove coverage.info \
-          "${GITHUB_WORKSPACE}/includes/catch/catch.hpp" \
+          "${GITHUB_WORKSPACE}/includes/*" \
           "${GITHUB_WORKSPACE}/src/gen_tile_test.cpp" \
           "/usr/*"
       working-directory: build

diff --git a/includes/renderd.h b/includes/renderd.h
@@ -69,6 +69,7 @@ extern struct request_queue * render_request_queue;
 void statsRenderFinish(int z, long time);
 void request_exit(void);
 void send_response(struct item *item, enum protoCmd rsp, int render_time);
+enum protoCmd rx_request(struct protocol *req, int fd);
 
 #ifdef __cplusplus
 }

diff --git a/src/gen_tile.cpp b/src/gen_tile.cpp
@@ -57,7 +57,7 @@
 #define image_32 image_rgba8
 #include <mapnik/image.hpp>
 #include <mapnik/image_view_any.hpp>
-#if MAPNIK_VERSION >= 400000
+#if MAPNIK_MAJOR_VERSION >= 4
 #include <mapnik/geometry/box2d.hpp>
 #else
 #include <mapnik/box2d.hpp>
@@ -361,7 +361,7 @@ static enum protoCmd render(Map &m, const char *tile_dir, char *xmlname, project
 
 void render_init(const char *plugins_dir, const char* font_dir, int font_dir_recurse)
 {
-	g_logger(G_LOG_LEVEL_INFO, "Renderd is using mapnik version %i.%i.%i", ((MAPNIK_VERSION) / 100000), (((MAPNIK_VERSION) / 100) % 1000), ((MAPNIK_VERSION) % 100));
+	g_logger(G_LOG_LEVEL_INFO, "Renderd is using mapnik version %i.%i.%i", MAPNIK_MAJOR_VERSION, MAPNIK_MINOR_VERSION, MAPNIK_PATCH_VERSION);
 	mapnik::datasource_cache::instance().register_datasources(plugins_dir);
 	load_fonts(font_dir, font_dir_recurse);
 }