From eb58fc095b1c8f11b86df77b0f6e795b1d7c1611 Mon Sep 17 00:00:00 2001 From: Marco Castelluccio Date: Fri, 4 Oct 2019 13:50:22 +0000 Subject: [PATCH] Bug 1574126 [wpt PR 18454] - [Azure Pipelines] drop old workaround for `safaridriver --version`, a=testonly Automatic update from web-platform-tests [Azure Pipelines] drop old workaround for `safaridriver --version` (#18454) The `--version` argument is supported starting in Safari 12.1: https://github.com/web-platform-tests/results-collection/issues/617 -- wpt-commits: a2d1acf3d4e8fe76eba70ee9b5f69dba2189819f wpt-pr: 18454 UltraBlame original commit: 5bdb6f1e8f37dfdc0ca96fdb8ae79ea0a36f2483 --- testing/web-platform/tests/.azure-pipelines.yml | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/testing/web-platform/tests/.azure-pipelines.yml b/testing/web-platform/tests/.azure-pipelines.yml index f883492ea93da..df92679e80e6a 100644 --- a/testing/web-platform/tests/.azure-pipelines.yml +++ b/testing/web-platform/tests/.azure-pipelines.yml @@ -334,10 +334,7 @@ jobs: channel: stable - template: tools/ci/azure/update_hosts.yml - template: tools/ci/azure/update_manifest.yml - - script: | - # TODO: drop this when `safaridriver --version` is supported. - SAFARI_VERSION="$(/usr/libexec/PlistBuddy -c 'Print :CFBundleShortVersionString' /Applications/Safari.app/Contents/Info.plist) ($(/usr/libexec/PlistBuddy -c 'Print :CFBundleVersion' /Applications/Safari.app/Contents/Info.plist))" - no_proxy='*' ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info --browser-version "$SAFARI_VERSION" safari + - script: no_proxy='*' ./wpt run --no-manifest-update --no-restart-on-unexpected --no-fail-on-unexpected --this-chunk=$(System.JobPositionInPhase) --total-chunks=$(System.TotalJobsInPhase) --chunk-type hash --log-wptreport $(Build.ArtifactStagingDirectory)/wpt_report_$(System.JobPositionInPhase).json --log-wptscreenshot $(Build.ArtifactStagingDirectory)/wpt_screenshot_$(System.JobPositionInPhase).txt --log-tbpl - --log-tbpl-level info safari displayName: 'Run tests' - task: PublishBuildArtifacts@1 displayName: 'Publish results'