This commit is contained in:
Sam Clegg
2020-08-10 17:12:56 -07:00
committed by GitHub
parent 1e5c650388
commit 839c108479
3 changed files with 9 additions and 5 deletions

View File

@@ -1,6 +1,7 @@
{
"latest": "1.40.1",
"latest": "2.0.0",
"releases": {
"2.0.0": "5974288502aab433d45f53511e961aaca4079d86",
"1.40.1": "536568644fd67d53778f6111fdd5f64ad3f4c539",
"1.40.0": "edf24e7233e0def312a08cc8dcec63a461155da1",
"1.39.20": "e7e39da9c81faecd9ecf44065cee864d76e4e34d",

View File

@@ -2637,11 +2637,14 @@ def error_on_missing_tool(name):
def expand_sdk_name(name):
if name in ('latest-fastcomp', 'latest-releases-fastcomp'):
# Since we no longer support fastcomp in ToT emscripten, the latest
# fastcomp release is fixed at 1.40.1.
name = 'sdk-fastcomp-1.40.1'
if name in ('latest', 'sdk-latest', 'latest-64bit', 'sdk-latest-64bit'):
# This is effectly the default SDK
return str(find_latest_releases_sdk('upstream'))
elif name in ('latest-fastcomp', 'latest-releases-fastcomp'):
return str(find_latest_releases_sdk('fastcomp'))
elif name in ('latest-upstream', 'latest-clang-upstream', 'latest-releases-upstream'):
return str(find_latest_releases_sdk('upstream'))
elif name in ('tot', 'sdk-tot'):

View File

@@ -148,8 +148,8 @@ assert open(emconfig).read().count('LLVM_ROOT') == 1
assert 'upstream' not in open(emconfig).read()
assert 'fastcomp' in open(emconfig).read()
print('verify version')
checked_call_with_output(fastcomp_emcc + ' -v', TAGS['latest'], stderr=subprocess.STDOUT)
print('verify latest fastcomp version is fixed at 1.40.1')
checked_call_with_output(fastcomp_emcc + ' -v', '1.40.1', stderr=subprocess.STDOUT)
print('clear cache')
check_call(upstream_emcc + ' --clear-cache')