Bug 1805504 - Disable wasm sandboxing when building rusttests. r=firefox-build-system-reviewers,nalexander

No rust code indirectly depends on wasm-sandboxed code, so we don't need
to build the sandbox.

Differential Revision: https://phabricator.services.mozilla.com/D164619
This commit is contained in:
Mike Hommey 2022-12-14 00:52:16 +00:00
parent 7d32caea45
commit 4819a4a6f8
4 changed files with 5 additions and 14 deletions

View File

@ -657,7 +657,6 @@ linux-rusttests/opt:
- linux64-pkgconf
- sysroot-i686-linux-gnu
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]
@ -701,7 +700,6 @@ linux-rusttests/debug:
- linux64-pkgconf
- sysroot-i686-linux-gnu
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]
@ -1515,7 +1513,6 @@ linux64-rusttests/opt:
- linux64-node
- linux64-pkgconf
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]
@ -1558,7 +1555,6 @@ linux64-rusttests/debug:
- linux64-node
- linux64-pkgconf
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]

View File

@ -109,7 +109,6 @@ macosx64-rusttests/opt:
- macosx64-nasm
- macosx64-node
- macosx64-sdk
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]
@ -142,6 +141,5 @@ macosx64-rusttests/debug:
- macosx64-nasm
- macosx64-node
- macosx64-sdk
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]

View File

@ -856,7 +856,6 @@ win32-rusttests/opt:
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]
@ -902,7 +901,6 @@ win32-rusttests/debug:
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]
@ -945,7 +943,6 @@ win64-rusttests/opt:
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]
@ -988,7 +985,6 @@ win64-rusttests/debug:
- win64-mozmake
- win64-dump_syms
- win64-vs2017
- sysroot-wasm32-wasi
optimization:
test-inclusive: [rusttests]

View File

@ -2367,11 +2367,12 @@ def wasm_sandboxing_libraries():
)
@depends(dependable(wasm_sandboxing_libraries))
def default_wasm_sandboxing_libraries(libraries):
non_default_libs = set()
@depends(dependable(wasm_sandboxing_libraries), build_project)
def default_wasm_sandboxing_libraries(libraries, build_project):
if build_project != "tools/rusttests":
non_default_libs = set()
return tuple(l for l in libraries if l not in non_default_libs)
return tuple(l for l in libraries if l not in non_default_libs)
option(