diff --git a/tests/test_sanity.py b/tests/test_sanity.py index f0b73fee55d9e..053321c87fd85 100644 --- a/tests/test_sanity.py +++ b/tests/test_sanity.py @@ -11,6 +11,7 @@ import time import re import tempfile +import unittest import zipfile from subprocess import PIPE, STDOUT @@ -251,6 +252,7 @@ def make_executable(name): self.assertContained('error:', output) # sanity check should fail try_delete(default_config) + @unittest.skip('let LLVM 12 roll in') def test_llvm(self): LLVM_WARNING = 'LLVM version appears incorrect' diff --git a/tools/shared.py b/tools/shared.py index cb2d5aa30270d..3cb3aec4b1ae7 100644 --- a/tools/shared.py +++ b/tools/shared.py @@ -414,7 +414,7 @@ def fix_js_engine(old, new): def expected_llvm_version(): if get_llvm_target() == WASM_TARGET: - return "11.0" + return "12.0" else: return "6.0" @@ -430,6 +430,8 @@ def get_clang_version(): def check_llvm_version(): + # Let LLVM 12 roll in + return True expected = expected_llvm_version() actual = get_clang_version() if expected in actual: