commit 28fdb9418ab3c3f45b010f1890c3442981b4df48
author Sam Lin <samlin@google.com> Fri Mar 24 01:48:13 2017 +0000
committer android-build-merger <android-build-merger@google.com> Fri Mar 24 01:48:13 2017 +0000
tree 78778f885b12784966135a3a8654665e2901179a
parent 61c3093295ad1e3a859ef77e323cbc4505f3167b
parent bb8fca3514f3d2914ee3f510ab86a8b8a7a7fd5f

Merge "Merge "Fix ITS Manual Test validate scene issue" into nougat-cts-dev am: 633ab068cd" into nougat-mr1-cts-dev
am: bb8fca3514

Change-Id: Ibb8c778cd5ddd28d6bf84e32d1d15a04184e35c3

apps/CameraITS/tools/run_all_tests.py

diff --git a/apps/CameraITS/tools/run_all_tests.py b/apps/CameraITS/tools/run_all_tests.py
index 497518e..541bcd6 100644
--- a/apps/CameraITS/tools/run_all_tests.py
+++ b/apps/CameraITS/tools/run_all_tests.py
@@ -225,7 +225,7 @@
                                scene_arg, screen_id_arg]
                 else:
                     # Skip scene validation for scene 5 running in parallel
-                    if merge_result_switch and scene != 'scene5':
+                    if not merge_result_switch or scene != 'scene5':
                         scene_arg = "scene=" + scene_req[scene]
                         extra_args = scene_extra_args.get(scene, [])
                         cmd = ['python',