Skip to content

Commit

Permalink
Update expected llvm version to 13.0
Browse files Browse the repository at this point in the history
This change temporarily disables the version check to allow
the llvm change to roll in.

Copied from the previous time around: #11637.
  • Loading branch information
sbc100 committed Jan 28, 2021
1 parent ae86492 commit 23fe2d6
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 2 deletions.
3 changes: 2 additions & 1 deletion tests/test_sanity.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
import zipfile
from subprocess import PIPE, STDOUT

from runner import RunnerCore, path_from_root, env_modify
from runner import RunnerCore, path_from_root, env_modify, disabled
from runner import create_test_file, ensure_dir, make_executable
from tools.config import config_file, EM_CONFIG
from tools.shared import PYTHON, EMCC
Expand Down Expand Up @@ -232,6 +232,7 @@ def make_new_executable(name):
self.assertContained('error:', output) # sanity check should fail
try_delete(default_config)

@disabled('let LLVM 13 roll in')
def test_llvm(self):
LLVM_WARNING = 'LLVM version appears incorrect'

Expand Down
4 changes: 3 additions & 1 deletion tools/shared.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
DEBUG = int(os.environ.get('EMCC_DEBUG', '0'))
EXPECTED_NODE_VERSION = (4, 1, 1)
EXPECTED_BINARYEN_VERSION = 99
EXPECTED_LLVM_VERSION = "12.0"
EXPECTED_LLVM_VERSION = "13.0"
SIMD_INTEL_FEATURE_TOWER = ['-msse', '-msse2', '-msse3', '-mssse3', '-msse4.1', '-msse4.2', '-mavx']
SIMD_NEON_FLAGS = ['-mfpu=neon']
PYTHON = sys.executable
Expand Down Expand Up @@ -158,6 +158,8 @@ def get_clang_version():


def check_llvm_version():
# Let LLVM 13 roll in
return True
actual = get_clang_version()
if EXPECTED_LLVM_VERSION in actual:
return True
Expand Down

0 comments on commit 23fe2d6

Please sign in to comment.