Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Let LLVM 12 roll in #11637

Merged
merged 1 commit into from
Jul 15, 2020
Merged

Let LLVM 12 roll in #11637

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions tests/test_sanity.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@
import time
import re
import tempfile
import unittest
import zipfile
from subprocess import PIPE, STDOUT

Expand Down Expand Up @@ -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'

Expand Down
4 changes: 3 additions & 1 deletion tools/shared.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand All @@ -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:
Expand Down