diff options
| author | Sam Clegg <sbc@chromium.org> | 2017-08-30 17:24:23 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-30 17:24:23 -0700 |
| commit | b1e8b1b515b2a1d0264975abc4de39c8044f7195 (patch) | |
| tree | 569843006d5f4ac38768915585798a659b32d48a /scripts/test/shared.py | |
| parent | 701c291ade59dd0824c167412746433a4f3d1366 (diff) | |
| download | binaryen-b1e8b1b515b2a1d0264975abc4de39c8044f7195.tar.gz binaryen-b1e8b1b515b2a1d0264975abc4de39c8044f7195.tar.bz2 binaryen-b1e8b1b515b2a1d0264975abc4de39c8044f7195.zip | |
Move test/local-revision into test/wasm-install (#1157)
This means you can do `rm -rf test/wasm-install` and have
it get redownloaded.
Diffstat (limited to 'scripts/test/shared.py')
| -rw-r--r-- | scripts/test/shared.py | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/scripts/test/shared.py b/scripts/test/shared.py index aa1f9ae3e..4f72b4c0e 100644 --- a/scripts/test/shared.py +++ b/scripts/test/shared.py @@ -194,13 +194,12 @@ def fetch_waterfall(): 'darwin': 'mac', 'win32': 'windows', 'cygwin': 'windows'}[sys.platform] - try: - local_rev_path = os.path.join(options.binaryen_test, 'local-revision') - local_rev = open(local_rev_path).read().strip() - except: - local_rev = None - if local_rev == rev: - return + local_rev_path = os.path.join(WATERFALL_BUILD_DIR, 'local-revision') + if os.path.exists(local_rev_path): + with open(local_rev_path) as f: + local_rev = f.read().strip() + if local_rev == rev: + return # fetch it basename = 'wasm-binaries-' + rev + '.tbz2' url = '/'.join(['https://storage.googleapis.com/wasm-llvm/builds', @@ -216,8 +215,8 @@ def fetch_waterfall(): subprocess.check_call(['tar', '-xf', os.path.abspath(fullname)], cwd=WATERFALL_BUILD_DIR) print '(noting local revision)' - with open(os.path.join(options.binaryen_test, 'local-revision'), 'w') as o: - o.write(rev) + with open(local_rev_path, 'w') as o: + o.write(rev + '\n') has_vanilla_llvm = False |