From 5be3a8e061c951dabd94ce7100ca551a16dbe012 Mon Sep 17 00:00:00 2001 From: Yuqian Li Date: Mon, 16 Oct 2017 16:01:19 -0400 Subject: Handle no stash case Bug: skia: Change-Id: Ie717f92306d32303cb2efcfe5809bb4d81ae80e0 Reviewed-on: https://skia-review.googlesource.com/60223 Reviewed-by: Eric Boren Commit-Queue: Yuqian Li --- tools/calmbench/calmbench.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tools/calmbench') 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( -- cgit v1.2.3