diff options
| author | Konstantin Käfer <mail@kkaefer.com> | 2018-05-24 11:25:12 +0200 |
|---|---|---|
| committer | Konstantin Käfer <mail@kkaefer.com> | 2018-05-24 21:50:29 +0200 |
| commit | 2694c0df037265fd37c6b9dc709efd5fa3472b12 (patch) | |
| tree | 40fdc111969ab54237db395cd140b0fc8e29c770 /test | |
| parent | b1f696155e2ff18e6d76c8f74eafadc7ee59cf71 (diff) | |
| download | qtlocation-mapboxgl-2694c0df037265fd37c6b9dc709efd5fa3472b12.tar.gz | |
[build] disable parts of the build that require node when WITH_NODEJS=OFF is set
Diffstat (limited to 'test')
| -rw-r--r-- | test/src/mbgl/test/util.cpp | 6 | ||||
| -rw-r--r-- | test/src/mbgl/test/util.hpp | 20 |
2 files changed, 12 insertions, 14 deletions
diff --git a/test/src/mbgl/test/util.cpp b/test/src/mbgl/test/util.cpp index 028a0a9d51..30eea19bdf 100644 --- a/test/src/mbgl/test/util.cpp +++ b/test/src/mbgl/test/util.cpp @@ -11,10 +11,6 @@ #include <unistd.h> -#ifndef NODE_EXECUTABLE -#define NODE_EXECUTABLE node -#endif - #define xstr(s) str(s) #define str(s) #s @@ -54,8 +50,6 @@ Server::Server(const char* script) { const char* executable = xstr(NODE_EXECUTABLE); - fprintf(stderr, "executable: %s\n", executable); - // Launch the actual server process. int ret = execl(executable, executable, script, nullptr); diff --git a/test/src/mbgl/test/util.hpp b/test/src/mbgl/test/util.hpp index 7a8d78897e..9f56841dcc 100644 --- a/test/src/mbgl/test/util.hpp +++ b/test/src/mbgl/test/util.hpp @@ -5,20 +5,24 @@ #endif #if ANDROID -#define TEST_READ_ONLY 0 -#define TEST_HAS_SERVER 0 + #define TEST_READ_ONLY 0 + #undef TEST_HAS_SERVER + #define TEST_HAS_SERVER 0 #elif TARGET_OS_IOS -#define TEST_READ_ONLY 1 -#define TEST_HAS_SERVER 0 + #define TEST_READ_ONLY 1 + #undef TEST_HAS_SERVER + #define TEST_HAS_SERVER 0 #else -#define TEST_READ_ONLY 0 -#define TEST_HAS_SERVER 1 + #define TEST_READ_ONLY 0 + #ifndef TEST_HAS_SERVER + #define TEST_HAS_SERVER 1 + #endif #endif #if TARGET_OS_SIMULATOR -#define TEST_IS_SIMULATOR 1 + #define TEST_IS_SIMULATOR 1 #else -#define TEST_IS_SIMULATOR 0 + #define TEST_IS_SIMULATOR 0 #endif #if !TEST_IS_SIMULATOR && !CI_BUILD |