From 11d2d5cb595759d88adafeefec1c724908b1471b Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 28 Sep 2021 16:48:09 -0700 Subject: [PATCH 1/2] made android unit tests not require the host engine variant to exist --- testing/run_tests.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/testing/run_tests.py b/testing/run_tests.py index 3d1fc40bd74ba..3538ebfc7d361 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -538,7 +538,7 @@ def main(): help='A single Java test class to run.') parser.add_argument('--android-variant', dest='android_variant', action='store', default='android_debug_unopt', - help='The engine build variant to run java tests for') + help='The engine build variant to run java/android tests for') parser.add_argument('--ios-variant', dest='ios_variant', action='store', default='ios_debug_sim_unopt', help='The engine build variant to run objective-c tests for') @@ -561,7 +561,7 @@ def main(): types = args.type.split(',') build_dir = os.path.join(out_dir, args.variant) - if args.type != 'java': + if args.type != 'java' and args.type != 'android': assert os.path.exists(build_dir), 'Build variant directory %s does not exist!' % build_dir if args.sanitizer_suppressions: From fcbc3d3385bb81176c7ed541c9d62aafa259e1fb Mon Sep 17 00:00:00 2001 From: Aaron Clarke Date: Tue, 28 Sep 2021 17:11:16 -0700 Subject: [PATCH 2/2] tweaked help page --- testing/run_tests.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/testing/run_tests.py b/testing/run_tests.py index 3538ebfc7d361..cd614aacc618f 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -538,7 +538,7 @@ def main(): help='A single Java test class to run.') parser.add_argument('--android-variant', dest='android_variant', action='store', default='android_debug_unopt', - help='The engine build variant to run java/android tests for') + help='The engine build variant to run java or android tests for') parser.add_argument('--ios-variant', dest='ios_variant', action='store', default='ios_debug_sim_unopt', help='The engine build variant to run objective-c tests for')