From 7d5e354ef670609bd82ca2d8537e648e579c938b Mon Sep 17 00:00:00 2001 From: Tim van der Meij Date: Sat, 11 Nov 2023 19:47:43 +0100 Subject: [PATCH] Remove the font tests command, and related logic, from the bots If https://github.com/mozilla/pdf.js/pull/17263 is in place, we will no longer run the font tests on the bots, which means that the font tests command should be removed. Moreover, we can get rid of all submodule installations because the project won't have any submodules anymore after that patch, which simplifies the code and reduces runtime of all tests a bit (note that the submodules were also installed for tests that didn't need them). --- on_cmd_browsertest.js | 2 -- on_cmd_fonttest.js | 37 ------------------------------------- on_cmd_integrationtest.js | 2 -- on_cmd_lint.js | 2 -- on_cmd_makeref.js | 2 -- on_cmd_test.js | 9 --------- on_cmd_unittest.js | 2 -- on_cmd_xfatest.js | 9 --------- 8 files changed, 65 deletions(-) delete mode 100644 on_cmd_fonttest.js diff --git a/on_cmd_browsertest.js b/on_cmd_browsertest.js index 0ab147a..c100a2c 100644 --- a/on_cmd_browsertest.js +++ b/on_cmd_browsertest.js @@ -4,8 +4,6 @@ require('shelljs/global'); var fail = false; exec('npm install', {async:true}, function() { -exec('git submodule init', {async:false}); -exec('git submodule update', {async:false}); silent(true); diff --git a/on_cmd_fonttest.js b/on_cmd_fonttest.js deleted file mode 100644 index 5e5f05f..0000000 --- a/on_cmd_fonttest.js +++ /dev/null @@ -1,37 +0,0 @@ -var botio = require(process.env['BOTIO_MODULE']); -require('shelljs/global'); - -var fail = false; - -exec('npm install', {async:false}); -exec('git submodule init', {async:false}); -exec('git submodule update', {async:false}); - -silent(true); - -// -// Deploy custom files -// -echo(); -echo('>> Deploying custom files'); -cp('-f', __dirname+'/test-files/browser_manifest.json', './test/resources/browser_manifests'); - -// -// Font Tests -// -echo(); -echo('>> Font Tests'); - -exec('gulp fonttest', {silent:false, async:true}, function(error, output) { - var successMatch = output.match(/All font tests passed/g); - - if (successMatch) { - botio.message('+ **Font Tests:** Passed'); - } else { - botio.message('+ **Font Tests:** FAILED'); - fail = true; // non-fatal, continue - } - - if (fail) - exit(1); -}); // exec font tests diff --git a/on_cmd_integrationtest.js b/on_cmd_integrationtest.js index cf3a2d7..c21f249 100644 --- a/on_cmd_integrationtest.js +++ b/on_cmd_integrationtest.js @@ -4,8 +4,6 @@ require('shelljs/global'); var fail = false; exec('npm install', {async:false}); -exec('git submodule init', {async:false}); -exec('git submodule update', {async:false}); silent(true); diff --git a/on_cmd_lint.js b/on_cmd_lint.js index 3274513..c183a13 100644 --- a/on_cmd_lint.js +++ b/on_cmd_lint.js @@ -4,8 +4,6 @@ require('shelljs/global'); var fail = false; exec('npm install', {async:false}); -exec('git submodule init', {async:false}); -exec('git submodule update', {async:false}); silent(true); diff --git a/on_cmd_makeref.js b/on_cmd_makeref.js index a0fd0c0..9bf7dcd 100644 --- a/on_cmd_makeref.js +++ b/on_cmd_makeref.js @@ -4,8 +4,6 @@ require('shelljs/global'); var fail = false; exec('npm install', {async:true}, function() { -exec('git submodule init', {async:false}); -exec('git submodule update', {async:false}); silent(true); diff --git a/on_cmd_test.js b/on_cmd_test.js index 14d5a3f..c96c5e8 100644 --- a/on_cmd_test.js +++ b/on_cmd_test.js @@ -4,8 +4,6 @@ require('shelljs/global'); var fail = false; exec('npm install', {async:true}, function() { -exec('git submodule init', {async:false}); -exec('git submodule update', {async:false}); silent(true); @@ -42,15 +40,8 @@ silent(true); exec('gulp bottest', {silent:false, async:true}, function(error, output) { var integrationSuccessMatch = output.match(/All integration tests passed/g); var unitSuccessMatch = output.match(/All unit tests passed/g); - var fontSuccessMatch = output.match(/All font tests passed/g); var regSuccessMatch = output.match(/All regression tests passed/g); - if (fontSuccessMatch) { - botio.message('+ **Font tests:** Passed'); - } else { - botio.message('+ **Font tests:** FAILED'); - fail = true; // non-fatal, continue - } if (unitSuccessMatch) { botio.message('+ **Unit tests:** Passed'); } else { diff --git a/on_cmd_unittest.js b/on_cmd_unittest.js index d4b63bc..c530775 100644 --- a/on_cmd_unittest.js +++ b/on_cmd_unittest.js @@ -4,8 +4,6 @@ require('shelljs/global'); var fail = false; exec('npm install', {async:false}); -exec('git submodule init', {async:false}); -exec('git submodule update', {async:false}); silent(true); diff --git a/on_cmd_xfatest.js b/on_cmd_xfatest.js index d844eef..e42f232 100644 --- a/on_cmd_xfatest.js +++ b/on_cmd_xfatest.js @@ -4,8 +4,6 @@ require('shelljs/global'); var fail = false; exec('npm install', {async:true}, function() { -exec('git submodule init', {async:false}); -exec('git submodule update', {async:false}); silent(true); @@ -42,15 +40,8 @@ silent(true); exec('gulp botxfatest', {silent:false, async:true}, function(error, output) { var integrationSuccessMatch = output.match(/All integration tests passed/g); var unitSuccessMatch = output.match(/All unit tests passed/g); - var fontSuccessMatch = output.match(/All font tests passed/g); var regSuccessMatch = output.match(/All regression tests passed/g); - if (fontSuccessMatch) { - botio.message('+ **Font tests:** Passed'); - } else { - botio.message('+ **Font tests:** FAILED'); - fail = true; // non-fatal, continue - } if (unitSuccessMatch) { botio.message('+ **Unit tests:** Passed'); } else {