chore: run arm tests unsandboxed again

electron · Jul 14, 2020 · bec5073 · bec5073
1 parent 0618721
commit bec5073
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 12 deletions.
diff --git a/patches/node/fix_do_not_register_the_esm_loader_in_renderer_processes.patch b/patches/node/fix_do_not_register_the_esm_loader_in_renderer_processes.patch
@@ -8,15 +8,16 @@ Only one ESM loader can be registered per isolate, in renderer processes this sh
 This can be attempted to be upstreamed as a new option --disable-esm-loader or something similar.
 
 diff --git a/lib/internal/bootstrap/pre_execution.js b/lib/internal/bootstrap/pre_execution.js
-index b4a0f71af5853f427a10449b52509052fbe3facd..06297a4c258e2f0b715da35f855c788d776fc437 100644
+index b4a0f71af5853f427a10449b52509052fbe3facd..ba5b0b6e51bcddbc5b9dd9c31231585d61b131a0 100644
 --- a/lib/internal/bootstrap/pre_execution.js
 +++ b/lib/internal/bootstrap/pre_execution.js
-@@ -408,6 +408,8 @@ function initializeCJSLoader() {
- }
-
- function initializeESMLoader() {
-+  // Do not hook the ESM loader in renderer processes as it overrides blinks loader
-+  if (process.type !== 'browser') return;
+@@ -411,6 +411,9 @@ function initializeESMLoader() {
    // Create this WeakMap in js-land because V8 has no C++ API for WeakMap.
    internalBinding('module_wrap').callbackMap = new SafeWeakMap();
 
++  // Do not hook the ESM loader in renderer processes as it overrides blinks loader
++  if (typeof process.type === 'string' && process.type !== 'browser') return;
++
+   const {
+     setImportModuleDynamicallyCallback,
+     setInitializeImportMetaObjectCallback
diff --git a/vsts-arm-test-steps.yml b/vsts-arm-test-steps.yml
@@ -73,9 +73,6 @@ steps:
     sudo gdk-pixbuf-query-loaders --update-cache
     cd src
     export ELECTRON_OUT_DIR=Default
-    unset ELECTRON_DISABLE_SANDBOX
-    sudo chown root out/Default/chrome-sandbox
-    sudo chmod 4755 out/Default/chrome-sandbox
     (cd electron && node script/yarn test -- --enable-logging)
   displayName: 'Run Electron tests'
   timeoutInMinutes: 20

diff --git a/vsts-arm32v7.yml b/vsts-arm32v7.yml
@@ -2,7 +2,7 @@ resources:
   containers:
   - container: arm32v7-test-container
     image: electronjs/build:arm32v7-697b894f36d127155e020f4e8ad4b2e5f6a09613
-    options: --shm-size 128m --cap-add SYS_ADMIN
+    options: --shm-size 128m
 
 jobs:
 - job: Test_Arm32v7

diff --git a/vsts-arm64v8.yml b/vsts-arm64v8.yml
@@ -2,7 +2,7 @@ resources:
   containers:
   - container: arm64v8-test-container
     image: electronjs/build:arm64v8-697b894f36d127155e020f4e8ad4b2e5f6a09613
-    options: --shm-size 128m --cap-add SYS_ADMIN
+    options: --shm-size 128m
 
 jobs:
 - job: Test_Arm64