summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.gitignore2
-rwxr-xr-xcheck.py12
2 files changed, 8 insertions, 6 deletions
diff --git a/.gitignore b/.gitignore
index 7b59d4c76..38319bc5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,4 +17,6 @@ cmake_install.cmake
*.ninja
.ninja_deps
.ninja_log
+test/wasm-binaries-*.tbz2
test/wasm-torture-s-*.tbz2
+test/wasm-install/
diff --git a/check.py b/check.py
index 77080f869..5e193b15d 100755
--- a/check.py
+++ b/check.py
@@ -103,15 +103,15 @@ if not has_emcc:
BASE_DIR = os.path.abspath('test')
WATERFALL_BUILD_DIR = os.path.join(BASE_DIR, 'wasm-install')
BIN_DIR = os.path.abspath(os.path.join(WATERFALL_BUILD_DIR, 'bin'))
+WASM_BINARIES = 'wasm-binaries-%s.tbz2'
def fetch_waterfall():
+ """Returns True if new binaries were installed."""
rev = open(os.path.join('test', 'revision')).read()
- if os.path.exists(os.path.join(BASE_DIR, 'wasm-binaries-%s.tbz2' % rev)): return
- # fetch it
- print '(downloading waterfall ' + rev + ')'
- basename = 'wasm-binaries-%s.tbz2'
- downloaded = scripts.storage.download_tar(basename, BASE_DIR, rev)
- scripts.support.untar(downloaded, BASE_DIR)
+ downloaded = scripts.storage.download_tar(WASM_BINARIES, BASE_DIR, rev)
+ if not os.path.isdir(WATERFALL_BUILD_DIR):
+ os.mkdir(WATERFALL_BUILD_DIR)
+ return scripts.support.untar(downloaded, BASE_DIR)
def setup_waterfall():
# if we can use the waterfall llvm, do so