From e59d8ba4391a829e671968054c20abe326102d1e Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 14 Aug 2023 10:51:40 -0700 Subject: [PATCH 1/2] Revert "Make run_tests.py assert that the ios test dylib is at least as new as libFlutter.dylib (#41720)" This reverts commit da45a21708f24662d14fa95512ecbd36be5d8e27. --- testing/run_tests.py | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/testing/run_tests.py b/testing/run_tests.py index 7f67c3aacbd44..81cc91273e887 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -608,22 +608,13 @@ def ensure_ios_tests_are_built(ios_out_dir): message.append( 'gn --ios --unoptimized --runtime-mode=debug --no-lto --simulator' ) - message.append('ninja -C %s ios_test_flutter' % ios_out_dir) + message.append('autoninja -C %s ios_test_flutter' % ios_out_dir) 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 - ios_test_lib_time = os.path.getmtime(ios_test_lib) - flutter_dylib = os.path.join(tmp_out_dir, 'libFlutter.dylib') - flutter_dylib_time = os.path.getmtime(flutter_dylib) - - final_message = '%s is older than %s. Please run the following commands: \n%s' % ( - ios_test_lib, flutter_dylib, '\n'.join(message) - ) - assert flutter_dylib_time <= ios_test_lib_time, final_message - def assert_expected_xcode_version(): """Checks that the user has a version of Xcode installed""" From 02d4869985486dc1cd7a51e0e3565ef9b54fa85e Mon Sep 17 00:00:00 2001 From: Dan Field Date: Mon, 14 Aug 2023 10:53:52 -0700 Subject: [PATCH 2/2] Update run_tests.py --- 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 81cc91273e887..7c8842af18927 100755 --- a/testing/run_tests.py +++ b/testing/run_tests.py @@ -608,7 +608,7 @@ def ensure_ios_tests_are_built(ios_out_dir): message.append( 'gn --ios --unoptimized --runtime-mode=debug --no-lto --simulator' ) - message.append('autoninja -C %s ios_test_flutter' % ios_out_dir) + message.append('ninja -C %s ios_test_flutter' % ios_out_dir) final_message = "%s or %s doesn't exist. Please run the following commands: \n%s" % ( ios_out_dir, ios_test_lib, '\n'.join(message) )