diff --git a/browser_patches/checkout_build_archive_upload.sh b/browser_patches/checkout_build_archive_upload.sh index b7a6839dd43c6..a54bc605341ca 100755 --- a/browser_patches/checkout_build_archive_upload.sh +++ b/browser_patches/checkout_build_archive_upload.sh @@ -164,19 +164,14 @@ function generate_and_upload_browser_build { return 22 fi - echo "-- running sanity test" - if ! ./$BROWSER_NAME/run_sanity_check.sh; then - return 23 - fi - echo "-- archiving to $ZIP_PATH" if ! ./$BROWSER_NAME/archive.sh $ZIP_PATH "$EXTRA_ARCHIVE_ARGS"; then - return 24 + return 23 fi echo "-- uploading" if ! ./upload.sh $BUILD_BLOB_PATH $ZIP_PATH; then - return 25 + return 24 fi return 0 } @@ -211,10 +206,8 @@ else elif (( RESULT_CODE == 22 )); then FAILED_STEP="./build.sh" elif (( RESULT_CODE == 23 )); then - FAILED_STEP="./run_sanity_check.sh" - elif (( RESULT_CODE == 24 )); then FAILED_STEP="./archive.sh" - elif (( RESULT_CODE == 25 )); then + elif (( RESULT_CODE == 24 )); then FAILED_STEP="./upload.sh" else FAILED_STEP="" diff --git a/browser_patches/firefox/run_sanity_check.sh b/browser_patches/firefox/run_sanity_check.sh deleted file mode 100755 index cce66c3ecd333..0000000000000 --- a/browser_patches/firefox/run_sanity_check.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -e -set +x - -trap "cd $(pwd -P)" EXIT -cd "$(dirname $0)" - -if [[ "$(uname)" == "Darwin" ]]; then - node ./sanity.js -elif [[ "$(uname)" == "Linux" ]]; then - xvfb-run --auto-servernum node ./sanity.js -elif [[ "$(uname)" == MINGW* ]]; then - node ./sanity.js -else - echo "ERROR: cannot check sanity on this platform!" 1>&2 - exit 1; -fi diff --git a/browser_patches/firefox/sanity.js b/browser_patches/firefox/sanity.js deleted file mode 100644 index 4f8ad3c23fe2b..0000000000000 --- a/browser_patches/firefox/sanity.js +++ /dev/null @@ -1,28 +0,0 @@ -const {firefox} = require('../..'); -const os = require('os'); -const path = require('path'); - -const executablePath = { - 'darwin': path.join(__dirname, 'checkout', 'obj-build-playwright', 'dist', 'Nightly.app', 'Contents', 'MacOS', 'firefox'), - 'linux': path.join(__dirname, 'checkout', 'obj-build-playwright', 'dist', 'bin', 'firefox'), - 'win32': path.join(__dirname, 'checkout', 'obj-build-playwright', 'dist', 'bin', 'firefox.exe'), -}[os.platform()]; - -async function checkSanity(options) { - const browser = await firefox.launch({...options, executablePath}); - const context = await browser.newContext(); - const page = await context.newPage(); - const result = await page.evaluate(() => 6 * 7); - await browser.close(); - if (result !== 42) - throw new Error(`ERROR: computation failed!`); - console.log(`SUCCESS: ran firefox with options = ${JSON.stringify(options)}`); -} - -Promise.all([ - checkSanity({headless: true}), - checkSanity({headless: false}), -]).catch(e => { - console.error(e); - process.exitCode = 1; -}); diff --git a/browser_patches/webkit/run_sanity_check.sh b/browser_patches/webkit/run_sanity_check.sh deleted file mode 100755 index 9a3ec11f7243d..0000000000000 --- a/browser_patches/webkit/run_sanity_check.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -set -e -set +x - -trap "cd $(pwd -P)" EXIT -cd "$(dirname $0)" - -if [[ "$(uname)" == "Darwin" ]]; then - node ./sanity.js -elif [[ "$(uname)" == "Linux" ]]; then - xvfb-run --auto-servernum node ./sanity.js -elif [[ "$(uname)" == MINGW* ]]; then - echo "Sanity check on windows is not supported" -else - echo "ERROR: cannot check sanity on this platform!" 1>&2 - exit 1; -fi diff --git a/browser_patches/webkit/sanity.js b/browser_patches/webkit/sanity.js deleted file mode 100644 index 020573cf3d90e..0000000000000 --- a/browser_patches/webkit/sanity.js +++ /dev/null @@ -1,33 +0,0 @@ -const {firefox} = require('../..'); -const os = require('os'); -const path = require('path'); - -const executablePath = { - 'darwin': path.join(__dirname, 'pw_run.sh'), - 'linux': path.join(__dirname, 'pw_run.sh'), - 'win32': undefined, -}[os.platform()]; - -// TODO: verify build on windows. -if (!executablePath) - return; - -async function checkSanity(options) { - const browser = await firefox.launch({...options, executablePath}); - const context = await browser.newContext(); - const page = await context.newPage(); - const result = await page.evaluate(() => 7 * 8); - await browser.close(); - if (result !== 56) - throw new Error(`ERROR: computation failed!`); - console.log(`SUCCESS: ran webkit with options = ${JSON.stringify(options)}`); -} - -Promise.all([ - checkSanity({headless: true}), - checkSanity({headless: false}), -]).catch(e => { - console.error(e); - process.exitCode = 1; -}); -