diff options
| author |  Yuqian Li <liyuqian@google.com> | 2017-10-16 16:01:19 -0400 |
|---|---|---|
| committer |  Skia Commit-Bot <skia-commit-bot@chromium.org> | 2017-10-17 13:46:12 +0000 |
| commit | 5be3a8e061c951dabd94ce7100ca551a16dbe012 (patch) | |
| tree | 5f00f672f865ed3aad2d094bd8b508030a91652f /tools/calmbench | |
| parent | cff9f956c794954a67000792ab632c17026ececf (diff) | |
Handle no stash case
Bug: skia:
Change-Id: Ie717f92306d32303cb2efcfe5809bb4d81ae80e0
Reviewed-on: https://skia-review.googlesource.com/60223
Reviewed-by: Eric Boren <borenet@google.com>
Commit-Queue: Yuqian Li <liyuqian@google.com>
Diffstat (limited to 'tools/calmbench')
| -rw-r--r-- | tools/calmbench/calmbench.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/calmbench/calmbench.py b/tools/calmbench/calmbench.py index 827bf4f909..4b484c905b 100644 --- a/tools/calmbench/calmbench.py +++ b/tools/calmbench/calmbench.py @@ -137,7 +137,11 @@ def compile_modified(args): cwd=args.skiadir) print "Compiling stashed code" - subprocess.check_call(['git', 'stash'], cwd=args.skiadir) + stash_output = subprocess.check_output(['git', 'stash'], cwd=args.skiadir) + if 'No local changes to save' in stash_output: + subprocess.check_call(['git', 'reset', 'HEAD^', '--soft']) + subprocess.check_call(['git', 'stash']) + subprocess.check_call( ['ninja', '-C', args.ninjadir, 'nanobench'], cwd=args.skiadir) subprocess.check_call( |