sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[unit-tests] fix windows 11 path search

Browse source
This commit is contained in:
Mathis Logemann 2021-10-09 13:46:55 +02:00
parent bf6081b207
commit a73d2f7d94
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
test/unit/datasource/ds_test_util.hpp
View file

@ -199,7 +199,11 @@ inline int create_disk_index(std::string const& filename, bool silent = true)
{ {
cmd += std::string("DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " "; cmd += std::string("DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " ";
} }
cmd += "mapnik-index " + filename; cmd += "mapnik-index";
#ifdef _WINDOWS
cmd += ".exe";
#endif
cmd += " " + filename;
if (silent) if (silent)
{ {
#ifndef _WINDOWS #ifndef _WINDOWS

7
test/unit/datasource/shapeindex.cpp
View file

@ -74,8 +74,11 @@ int create_shapefile_index(std::string const& filename, bool index_parts, bool s
{ {
cmd += std::string("DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " "; cmd += std::string("DYLD_LIBRARY_PATH=") + std::getenv("DYLD_LIBRARY_PATH") + " ";
} }
cmd += "shapeindex";
cmd += "shapeindex "; #ifdef _WINDOWS
cmd += ".exe";
#endif
cmd += " ";
if (index_parts) cmd+= "--index-parts "; if (index_parts) cmd+= "--index-parts ";
cmd += filename; cmd += filename;
if (silent) if (silent)