3 files changed, 24 insertions, 4 deletions
diff --git a/platform/default/mbgl/test/main.cpp b/platform/default/mbgl/test/main.cpp
new file mode 100644
index 0000000000..d01cf75ffc
--- /dev/null
+++ b/platform/default/mbgl/test/main.cpp
@@ -0,0 +1,20 @@
+#include <mbgl/test.hpp>
+#include <unistd.h>
+#include <cstring>
+#include <cerrno>
+#include <cstdio>
+
+#define xstr(s) str(s)
+#define str(s) #s
+
+int main(int argc, char *argv[]) {
+#ifdef WORK_DIRECTORY
+    const int result = chdir(xstr(WORK_DIRECTORY));
+    if (result != 0) {
+        fprintf(stderr, "failed to change directory: %s\n", strerror(errno));
+        return errno;
+    }
+#endif
+
+    return mbgl::runTests(argc, argv);
+}
diff --git a/platform/linux/config.cmake b/platform/linux/config.cmake
index bad3751b06..5e0f07073c 100644
--- a/platform/linux/config.cmake
+++ b/platform/linux/config.cmake
@@ -132,11 +132,11 @@ endmacro()
 
 macro(mbgl_platform_test)
     target_sources(mbgl-test
-        PRIVATE test/src/main.cpp
+        PRIVATE platform/default/mbgl/test/main.cpp
     )
 
     set_source_files_properties(
-        test/src/main.cpp
+        platform/default/mbgl/test/main.cpp
             PROPERTIES
         COMPILE_FLAGS -DWORK_DIRECTORY="${CMAKE_SOURCE_DIR}"
     )
diff --git a/platform/macos/config.cmake b/platform/macos/config.cmake
index 2e4b7a01b2..ced1121cca 100644
--- a/platform/macos/config.cmake
+++ b/platform/macos/config.cmake
@@ -111,11 +111,11 @@ endmacro()
 
 macro(mbgl_platform_test)
     target_sources(mbgl-test
-        PRIVATE test/src/main.cpp
+        PRIVATE platform/default/mbgl/test/main.cpp
     )
 
     set_source_files_properties(
-        test/src/main.cpp
+        platform/default/mbgl/test/main.cpp
             PROPERTIES
         COMPILE_FLAGS -DWORK_DIRECTORY="${CMAKE_SOURCE_DIR}"
     )