diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-01-28 21:24:32 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-01-28 21:24:32 +0200 |
| commit | 32222115cc0836dd157162c67739ec7ece890e2f (patch) | |
| tree | 5fc806115ef4c43d03f9e65a772fb3daed37801f | |
| parent | 0a5af170fbc9e7ad9b502162aa1257cea0feccdb (diff) | |
| download | qtlocation-mapboxgl-32222115cc0836dd157162c67739ec7ece890e2f.tar.gz | |
ios path fix
| -rw-r--r-- | platform/ios/ios.cmake | 2 | ||||
| -rwxr-xr-x | render-test/ios/setup_test_data.sh | 30 |
2 files changed, 17 insertions, 15 deletions
diff --git a/platform/ios/ios.cmake b/platform/ios/ios.cmake index 993384b5fc..866f8919be 100644 --- a/platform/ios/ios.cmake +++ b/platform/ios/ios.cmake @@ -97,7 +97,7 @@ if(MBGL_IOS_RENDER_TEST) set(CMAKE_OSX_ARCHITECTURES "armv7;i386;x86_64;arm64") set(PREPARE_CMD "${PROJECT_SOURCE_DIR}/render-test/ios/setup_test_data.sh") message("COMMAND: ${PREPARE_CMD}") - execute_process(COMMAND ${PREPARE_CMD} RESULT_VARIABLE CMD_ERROR) + execute_process(COMMAND ${PREPARE_CMD} RESULT_VARIABLE CMD_ERROR WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}) message(STATUS "CMD_ERROR:" ${CMD_ERROR}) set(RESOURCES ${PROJECT_SOURCE_DIR}/render-test/ios/Main.storyboard ${PROJECT_SOURCE_DIR}/render-test/ios/LaunchScreen.storyboard diff --git a/render-test/ios/setup_test_data.sh b/render-test/ios/setup_test_data.sh index fbce92f85f..b5da113b6c 100755 --- a/render-test/ios/setup_test_data.sh +++ b/render-test/ios/setup_test_data.sh @@ -1,16 +1,18 @@ #!/bin/bash -rm -rf ../../test-data -mkdir ../../test-data -mkdir ../../test-data/integration -mkdir ../../test-data/baselines -cp -r ../../mapbox-gl-js/test/integration/render-tests ../../test-data/integration/ -cp -r ../../mapbox-gl-js/test/integration/query-tests ../../test-data/integration/ -cp -r ../../metrics/expectations ../../test-data/ -cp -r ../../metrics/ignores ../../test-data/ -cp -r ../../metrics/tests ../../test-data/ -cp -r ../../metrics/ios-render-test-runner ../../test-data/ -cp -r ../../metrics/ios-render-test-runner-style.json ../../test-data/ -cp -r ../../metrics/ios-render-test-runner-metrics.json ../../test-data/ -cp -r ../../metrics/cache-metrics.db ../../test-data/ -cp -r ../../metrics/cache-style.db ../../test-data/ +rm -rf test-data + +mkdir test-data +mkdir test-data/integration +mkdir test-data/baselines + +cp -r mapbox-gl-js/test/integration/render-tests test-data/integration +cp -r mapbox-gl-js/test/integration/query-tests test-data/integration +cp -r metrics/expectations test-data +cp -r metrics/ignores test-data +cp -r metrics/tests test-data +cp -r metrics/ios-render-test-runner test-data +cp -r metrics/ios-render-test-runner-style.json test-data +cp -r metrics/ios-render-test-runner-metrics.json test-data +cp -r metrics/cache-metrics.db test-data +cp -r metrics/cache-style.db test-data |