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

Properly clean up downloaded zips (#322)

Browse Source 
We got this wrong because we were not using get_download_target, so we were trying to delete the wrong file.

Also add a test.

Fixes #320
This commit is contained in:
Alon Zakai
2019-08-20 12:26:44 -07:00
committed by GitHub
parent 64c5e81772
commit 6a4c0f981d
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
emsdk
View File

@@ -1624,9 +1624,9 @@ class Tool(object):
url = self.download_url() url = self.download_url()
if url.endswith(ARCHIVE_SUFFIXES): if url.endswith(ARCHIVE_SUFFIXES):
file_name = url.split('/')[-1] file_name = url.split('/')[-1]
tempzipfile = os.path.join('zips/', file_name) download_target = get_download_target(url, zips_subdir, getattr(self, 'zipfile_prefix', ''))
if VERBOSE: print("Deleting temporary zip file " + tempzipfile) if VERBOSE: print("Deleting temporary zip file " + download_target)
rmfile(tempzipfile) rmfile(download_target)
def uninstall(self): def uninstall(self):
if not self.is_installed(): if not self.is_installed():

2
test.py
View File

@@ -122,6 +122,8 @@ check_call('./emsdk activate sdk-1.38.31-64bit')
print('test specific release (new, short name)') print('test specific release (new, short name)')
check_call('./emsdk install 1.38.33') check_call('./emsdk install 1.38.33')
print('another install must re-download')
checked_call_with_output('./emsdk install 1.38.33', expected='Downloading:', unexpected='already exist in destination')
check_call('./emsdk activate 1.38.33') check_call('./emsdk activate 1.38.33')
assert 'fastcomp' in open(os.path.expanduser('~/.emscripten')).read() assert 'fastcomp' in open(os.path.expanduser('~/.emscripten')).read()
assert 'upstream' not in open(os.path.expanduser('~/.emscripten')).read() assert 'upstream' not in open(os.path.expanduser('~/.emscripten')).read()