diff options
| author | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-01-27 16:31:33 +0200 |
|---|---|---|
| committer | Thiago Marcos P. Santos <tmpsantos@gmail.com> | 2020-01-28 00:44:07 +0200 |
| commit | 0de6ffc383022e3ebfb658a729a0c9d7d7b026c4 (patch) | |
| tree | 415d7542d0fd526b4c2daec74aa46728524a21f3 /render-test | |
| parent | 8ddb0a959002b96dda1e656e3bcd87ac55286122 (diff) | |
| download | qtlocation-mapboxgl-0de6ffc383022e3ebfb658a729a0c9d7d7b026c4.tar.gz | |
[build] Cleanup CircleCI configuration
- Remove the legacy build jobs
- Remove the next- namespace.
Diffstat (limited to 'render-test')
| -rw-r--r-- | render-test/android/app/src/main/assets/to_zip.txt | 6 | ||||
| -rw-r--r-- | render-test/ios/iosTestRunner.mm | 4 | ||||
| -rw-r--r-- | render-test/ios/ios_test_runner.cpp | 4 | ||||
| -rwxr-xr-x | render-test/ios/setup_test_data.sh | 8 |
4 files changed, 11 insertions, 11 deletions
diff --git a/render-test/android/app/src/main/assets/to_zip.txt b/render-test/android/app/src/main/assets/to_zip.txt index 3f1dce02a5..29b6315cc5 100644 --- a/render-test/android/app/src/main/assets/to_zip.txt +++ b/render-test/android/app/src/main/assets/to_zip.txt @@ -3,8 +3,8 @@ mapbox-gl-js/test/integration/query-tests/ metrics/expectations/ metrics/ignores/ metrics/tests/ -metrics/next-android-render-test-runner/ -metrics/next-android-render-test-runner-metrics.json -metrics/next-android-render-test-runner-style.json +metrics/android-render-test-runner/ +metrics/android-render-test-runner-metrics.json +metrics/android-render-test-runner-style.json metrics/cache-metrics.db metrics/cache-style.db diff --git a/render-test/ios/iosTestRunner.mm b/render-test/ios/iosTestRunner.mm index 5c0365d367..3fe16c1d8e 100644 --- a/render-test/ios/iosTestRunner.mm +++ b/render-test/ios/iosTestRunner.mm @@ -76,8 +76,8 @@ std::string basePath = std::string([path UTF8String]); self.testStatus = self.runner->startTest(basePath) ? YES : NO; - self.styleResultPath = [path stringByAppendingPathComponent:@"/next-ios-render-test-runner-style.html"]; - self.metricResultPath = [path stringByAppendingPathComponent:@"/next-ios-render-test-runner-metrics.html"]; + self.styleResultPath = [path stringByAppendingPathComponent:@"/ios-render-test-runner-style.html"]; + self.metricResultPath = [path stringByAppendingPathComponent:@"/ios-render-test-runner-metrics.html"]; BOOL fileFound = [fileManager fileExistsAtPath: self.styleResultPath]; if (fileFound == NO) { diff --git a/render-test/ios/ios_test_runner.cpp b/render-test/ios/ios_test_runner.cpp index ceb44440aa..bb93db489d 100644 --- a/render-test/ios/ios_test_runner.cpp +++ b/render-test/ios/ios_test_runner.cpp @@ -35,8 +35,8 @@ bool TestRunner::startTest(const std::string& manifestBasePath) { bool status = false; try { - status = runTestWithManifest(manifestBasePath + "/next-ios-render-test-runner-style.json"); - status = runTestWithManifest(manifestBasePath + "/next-ios-render-test-runner-metrics.json") && status; + status = runTestWithManifest(manifestBasePath + "/ios-render-test-runner-style.json"); + status = runTestWithManifest(manifestBasePath + "/ios-render-test-runner-metrics.json") && status; } catch (...) { mbgl::Log::Info(mbgl::Event::General, "Failed with exception"); } diff --git a/render-test/ios/setup_test_data.sh b/render-test/ios/setup_test_data.sh index a7d56827ce..fbce92f85f 100755 --- a/render-test/ios/setup_test_data.sh +++ b/render-test/ios/setup_test_data.sh @@ -9,8 +9,8 @@ cp -r ../../mapbox-gl-js/test/integration/query-tests ../../test-data/integratio cp -r ../../metrics/expectations ../../test-data/ cp -r ../../metrics/ignores ../../test-data/ cp -r ../../metrics/tests ../../test-data/ -cp -r ../../metrics/next-ios-render-test-runner ../../test-data/ -cp -r ../../metrics/next-ios-render-test-runner-style.json ../../test-data/ -cp -r ../../metrics/next-ios-render-test-runner-metrics.json ../../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/
\ No newline at end of file +cp -r ../../metrics/cache-style.db ../../test-data/ |