Skip to content
Snippets Groups Projects
Commit b71b392f authored by Sylvain Henry's avatar Sylvain Henry Committed by Marge Bot
Browse files

JS: avoid EMCC logging spurious failure

emcc would sometime output messages like:

  cache:INFO: generating system asset: symbol_lists/424b44514e43d789148e69e4e7d1c7fdc0350b79.json... (this will be cached in "/emsdk/upstream/emscripten/cache/symbol_lists/424b44514e43d789148e69e4e7d1c7fdc0350b79.json" for subsequent builds)
  cache:INFO:  - ok

Cf https://github.com/emscripten-core/emscripten/issues/18607

This breaks our tests matching the stderr output. We avoid this by setting EMCC_LOGGING=0
parent aef587f6
No related branches found
No related tags found
No related merge requests found
...@@ -47,6 +47,11 @@ ghc_env['TERM'] = 'vt100' ...@@ -47,6 +47,11 @@ ghc_env['TERM'] = 'vt100'
# Ensure that GHC doesn't go looking for environment files. See #21365. # Ensure that GHC doesn't go looking for environment files. See #21365.
ghc_env['GHC_ENVIRONMENT'] = "-" ghc_env['GHC_ENVIRONMENT'] = "-"
# Ensure that EMCC doesn't output cache info
# (cf https://github.com/emscripten-core/emscripten/issues/18607)
os.environ['EMCC_LOGGING'] = '0'
ghc_env['EMCC_LOGGING'] = '0'
global config global config
config = getConfig() # get it from testglobals config = getConfig() # get it from testglobals
config.validate() config.validate()
......
...@@ -2676,6 +2676,8 @@ def normalise_errmsg(s: str) -> str: ...@@ -2676,6 +2676,8 @@ def normalise_errmsg(s: str) -> str:
s = re.sub('.*strip: changes being made to the file will invalidate the code signature in.*\n','',s) s = re.sub('.*strip: changes being made to the file will invalidate the code signature in.*\n','',s)
# clang may warn about unused argument when used as assembler # clang may warn about unused argument when used as assembler
s = re.sub('.*warning: argument unused during compilation:.*\n', '', s) s = re.sub('.*warning: argument unused during compilation:.*\n', '', s)
# Emscripten displays cache info and old emcc doesn't support EMCC_LOGGING=0
s = re.sub('cache:INFO: .*\n', '', s)
return s return s
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment