diff options
| author | Hal Canary <halcanary@google.com> | 2018-01-30 15:35:10 -0500 |
|---|---|---|
| committer | Hal Canary <halcanary@google.com> | 2018-01-30 15:37:00 -0500 |
| commit | 26f2d357569b8380c00f2f5f7b3be51ebc56ef59 (patch) | |
| tree | 1f38114fe7db3dfea94b3511eadac94d7d5eb57a /platform_tools/android | |
| parent | 8e9898bd176217b25cca468a92d9aaeb7d664621 (diff) | |
| parent | 51494f6615b8bd637caf0fd6d0d577ea19d50948 (diff) | |
| download | skqp-26f2d357569b8380c00f2f5f7b3be51ebc56ef59.tar.gz | |
Merge branch master into skqp/dev
Also, update SkQP model.
Change-Id: Ieddb5558c798eab73c2a13a7c9bb03d59b8a36c7
Diffstat (limited to 'platform_tools/android')
4 files changed, 11 insertions, 4 deletions
diff --git a/platform_tools/android/apps/skqp/src/main/assets/.gitignore b/platform_tools/android/apps/skqp/src/main/assets/.gitignore index 0dddfcbb63..036d7bbeb4 100644 --- a/platform_tools/android/apps/skqp/src/main/assets/.gitignore +++ b/platform_tools/android/apps/skqp/src/main/assets/.gitignore @@ -1,3 +1,4 @@ /gmkb /skqp /files.txt +/resources diff --git a/platform_tools/android/apps/skqp/src/main/assets/files.checksum b/platform_tools/android/apps/skqp/src/main/assets/files.checksum index 56dc126da2..219f8a44d6 100644 --- a/platform_tools/android/apps/skqp/src/main/assets/files.checksum +++ b/platform_tools/android/apps/skqp/src/main/assets/files.checksum @@ -1 +1 @@ -5554f8eed1b737026636523adbae5153 +e48ac148d290362d706aaf0cd18a2d17 diff --git a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java index eb95d7fb53..c5d0124cc1 100644 --- a/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java +++ b/platform_tools/android/apps/skqp/src/main/java/org/skia/skqp/SkQPRunner.java @@ -78,12 +78,16 @@ public class SkQPRunner extends Runner { @Override public void run(RunNotifier notifier) { + int numberOfTests = this.testCount(); + int testNumber = 1; Annotation annots[] = new Annotation[0]; for (int backend = 0; backend < impl.mBackends.length; backend++) { String classname = SkQP.kSkiaGM + impl.mBackends[backend]; for (int gm = 0; gm < impl.mGMs.length; gm++) { String gmName = String.format("%s/%s", impl.mBackends[backend], impl.mGMs[gm]); - Log.v(TAG, String.format("Rendering Test %s started", gmName)); + Log.v(TAG, String.format("Rendering Test %s started (%d/%d).", + gmName, testNumber, numberOfTests)); + testNumber++; Description desc = Description.createTestDescription(classname, impl.mGMs[gm], annots); notifier.fireTestStarted(desc); @@ -109,7 +113,9 @@ public class SkQPRunner extends Runner { } for (int unitTest = 0; unitTest < impl.mUnitTests.length; unitTest++) { String utName = impl.mUnitTests[unitTest]; - Log.v(TAG, String.format("Test %s started.", utName)); + Log.v(TAG, String.format("Test %s started (%d/%d).", + utName, testNumber, numberOfTests)); + testNumber++; Description desc = Description.createTestDescription( SkQP.kSkiaUnitTests, utName, annots); notifier.fireTestStarted(desc); diff --git a/platform_tools/android/bin/android_build_app b/platform_tools/android/bin/android_build_app index 31afe96c2d..5f47ff20a0 100755 --- a/platform_tools/android/bin/android_build_app +++ b/platform_tools/android/bin/android_build_app @@ -28,7 +28,7 @@ if args.output_dir == None: args_gn_path = os.path.join(args.output_dir, "args.gn") if os.path.exists(args_gn_path): for line in open(args_gn_path): - m = re.match('target_cpu ?= ?"(.*)"', line.strip()) + m = re.match('target_cpu *= *"(.*)"', line.strip()) if m: target_cpu = m.group(1) |