From b0725b4fa1e54e1b553a0a656714a289d1ad1d79 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 5 Nov 2021 09:43:50 -0700 Subject: [PATCH 1/2] ios test script checks for ios_test_flutter artifacts --- testing/run_tests.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/testing/run_tests.py b/testing/run_tests.py index 1c12894c0ded8..42a65ca4bbfd6 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -9,6 +9,7 @@ """ import argparse +from genericpath import exists import glob import os import re @@ -297,12 +298,13 @@ def EnsureDebugUnoptSkyPackagesAreBuilt(): def EnsureIosTestsAreBuilt(ios_out_dir): """Builds the engine variant and the test dylib containing the XCTests""" tmp_out_dir = os.path.join(out_dir, ios_out_dir) + ios_test_lib = os.path.join(tmp_out_dir, 'libios_test_flutter.dylib') message = [] message.append('gn --ios --unoptimized --runtime-mode=debug --no-lto --simulator') message.append('autoninja -C %s ios_test_flutter' % ios_out_dir) - final_message = '%s doesn\'t exist. Please run the following commands: \n%s' % ( - ios_out_dir, '\n'.join(message)) - assert os.path.exists(tmp_out_dir), final_message + final_message = '%s or %s doesn\'t exist. Please run the following commands: \n%s' % ( + ios_out_dir, ios_test_lib, '\n'.join(message)) + assert os.path.exists(tmp_out_dir) and os.path.exists(ios_test_lib), final_message def AssertExpectedXcodeVersion(): From bd3da3188bdf66e53f796e48ef0363941fc44e22 Mon Sep 17 00:00:00 2001 From: Chris Yang Date: Fri, 5 Nov 2021 09:50:54 -0700 Subject: [PATCH 2/2] remove unnecessary import --- testing/run_tests.py | 1 - 1 file changed, 1 deletion(-) diff --git a/testing/run_tests.py b/testing/run_tests.py index 42a65ca4bbfd6..ba8fcd4263876 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -9,7 +9,6 @@ """ import argparse -from genericpath import exists import glob import os import re