admin/ci-emsdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Error on unknown arguments passed to --activate (#1313)

Browse Source 
See #1312
This commit is contained in:
Sam Clegg
2023-12-08 10:30:37 -08:00
committed by GitHub
parent ef77dcc2c0
commit cc1b3efbd3
2 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
emsdk.py
View File

@@ -3047,13 +3047,12 @@ def main(args):
print('') print('')
tools_to_activate = currently_active_tools() tools_to_activate = currently_active_tools()
args = [x for x in args if not x.startswith('--')]
for arg in args: for arg in args:
tool = find_tool(arg) tool = find_tool(arg)
if tool is None: if tool is None:
tool = find_sdk(arg) tool = find_sdk(arg)
if tool is None: if tool is None:
error_on_missing_tool(arg) error_on_missing_tool(arg)
tools_to_activate += [tool] tools_to_activate += [tool]
if not tools_to_activate: if not tools_to_activate:
errlog('No tools/SDKs specified to activate! Usage:\n emsdk activate tool/sdk1 [tool/sdk2] [...]') errlog('No tools/SDKs specified to activate! Usage:\n emsdk activate tool/sdk1 [tool/sdk2] [...]')

3
test/test_activation.ps1
View File

@@ -15,8 +15,7 @@ try {
& "$repo_root/emsdk.ps1" install latest & "$repo_root/emsdk.ps1" install latest
$esc = '--%' & "$repo_root/emsdk.ps1" activate latest $env:PERMANENT_FLAG $env:SYSTEM_FLAG
& "$repo_root/emsdk.ps1" activate latest $esc $env:PERMANENT_FLAG $env:SYSTEM_FLAG
if ($env:SYSTEM_FLAG) { if ($env:SYSTEM_FLAG) {
$env_type = "Machine" $env_type = "Machine"