Modify iOS output filters to allow for .dylib extensions.

beeware · Sep 5, 2023 · 8510bf9 · 8510bf9
1 parent fc4efc8
commit 8510bf9
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 15 deletions.
diff --git a/src/briefcase/platforms/iOS/xcode.py b/src/briefcase/platforms/iOS/xcode.py
@@ -476,7 +476,8 @@ def run_app(
                 "--predicate",
                 f'senderImagePath ENDSWITH "/{app.formal_name}"'
                 f' OR (processImagePath ENDSWITH "/{app.formal_name}"'
-                ' AND senderImagePath ENDSWITH "-iphonesimulator.so")',
+                ' AND (senderImagePath ENDSWITH "-iphonesimulator.so"'
+                ' OR senderImagePath ENDSWITH "-iphonesimulator.dylib"))',
             ],
             stdout=subprocess.PIPE,
             stderr=subprocess.STDOUT,

diff --git a/src/briefcase/platforms/macOS/__init__.py b/src/briefcase/platforms/macOS/__init__.py
@@ -28,7 +28,7 @@
 
 MACOS_LOG_PREFIX_REGEX = re.compile(
     r"\d{4}-\d{2}-\d{2} (?P<timestamp>\d{2}:\d{2}:\d{2}.\d{3}) Df (.*?)\[.*?:.*?\]"
-    r"(?P<subsystem>( \(libffi\.dylib\))|( \(_ctypes\.cpython-3\d{1,2}-.*?\.so\)))? (?P<content>.*)"
+    r"(?P<subsystem>( \(libffi\.dylib\))|( \(_ctypes\.cpython-3\d{1,2}-.*?\.(so|dylib)\)))? (?P<content>.*)"
 )
 
 ADHOC_IDENTITY_NAME = (

diff --git a/tests/platforms/iOS/xcode/test_run.py b/tests/platforms/iOS/xcode/test_run.py
@@ -171,7 +171,8 @@ def test_run_app_simulator_booted(run_command, first_app_config, tmp_path):
             "--predicate",
             'senderImagePath ENDSWITH "/First App"'
             ' OR (processImagePath ENDSWITH "/First App"'
-            ' AND senderImagePath ENDSWITH "-iphonesimulator.so")',
+            ' AND (senderImagePath ENDSWITH "-iphonesimulator.so"'
+            ' OR senderImagePath ENDSWITH "-iphonesimulator.dylib"))',
         ],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
@@ -292,7 +293,8 @@ def test_run_app_simulator_booted_underscore(
             "--predicate",
             'senderImagePath ENDSWITH "/First App"'
             ' OR (processImagePath ENDSWITH "/First App"'
-            ' AND senderImagePath ENDSWITH "-iphonesimulator.so")',
+            ' AND (senderImagePath ENDSWITH "-iphonesimulator.so"'
+            ' OR senderImagePath ENDSWITH "-iphonesimulator.dylib"))',
         ],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
@@ -411,7 +413,8 @@ def test_run_app_with_passthrough(run_command, first_app_config, tmp_path):
             "--predicate",
             'senderImagePath ENDSWITH "/First App"'
             ' OR (processImagePath ENDSWITH "/First App"'
-            ' AND senderImagePath ENDSWITH "-iphonesimulator.so")',
+            ' AND (senderImagePath ENDSWITH "-iphonesimulator.so"'
+            ' OR senderImagePath ENDSWITH "-iphonesimulator.dylib"))',
         ],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
@@ -532,7 +535,8 @@ def test_run_app_simulator_shut_down(run_command, first_app_config, tmp_path):
             "--predicate",
             'senderImagePath ENDSWITH "/First App"'
             ' OR (processImagePath ENDSWITH "/First App"'
-            ' AND senderImagePath ENDSWITH "-iphonesimulator.so")',
+            ' AND (senderImagePath ENDSWITH "-iphonesimulator.so"'
+            ' OR senderImagePath ENDSWITH "-iphonesimulator.dylib"))',
         ],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
@@ -666,7 +670,8 @@ def test_run_app_simulator_shutting_down(run_command, first_app_config, tmp_path
             "--predicate",
             'senderImagePath ENDSWITH "/First App"'
             ' OR (processImagePath ENDSWITH "/First App"'
-            ' AND senderImagePath ENDSWITH "-iphonesimulator.so")',
+            ' AND (senderImagePath ENDSWITH "-iphonesimulator.so"'
+            ' OR senderImagePath ENDSWITH "-iphonesimulator.dylib"))',
         ],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
@@ -1027,7 +1032,8 @@ def test_run_app_simulator_launch_failure(run_command, first_app_config, tmp_pat
             "--predicate",
             'senderImagePath ENDSWITH "/First App"'
             ' OR (processImagePath ENDSWITH "/First App"'
-            ' AND senderImagePath ENDSWITH "-iphonesimulator.so")',
+            ' AND (senderImagePath ENDSWITH "-iphonesimulator.so"'
+            ' OR senderImagePath ENDSWITH "-iphonesimulator.dylib"))',
         ],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
@@ -1146,7 +1152,8 @@ def test_run_app_simulator_no_pid(run_command, first_app_config, tmp_path):
             "--predicate",
             'senderImagePath ENDSWITH "/First App"'
             ' OR (processImagePath ENDSWITH "/First App"'
-            ' AND senderImagePath ENDSWITH "-iphonesimulator.so")',
+            ' AND (senderImagePath ENDSWITH "-iphonesimulator.so"'
+            ' OR senderImagePath ENDSWITH "-iphonesimulator.dylib"))',
         ],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
@@ -1267,7 +1274,8 @@ def test_run_app_simulator_non_integer_pid(run_command, first_app_config, tmp_pa
             "--predicate",
             'senderImagePath ENDSWITH "/First App"'
             ' OR (processImagePath ENDSWITH "/First App"'
-            ' AND senderImagePath ENDSWITH "-iphonesimulator.so")',
+            ' AND (senderImagePath ENDSWITH "-iphonesimulator.so"'
+            ' OR senderImagePath ENDSWITH "-iphonesimulator.dylib"))',
         ],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
@@ -1362,7 +1370,8 @@ def test_run_app_test_mode(run_command, first_app_config, tmp_path):
             "--predicate",
             'senderImagePath ENDSWITH "/First App"'
             ' OR (processImagePath ENDSWITH "/First App"'
-            ' AND senderImagePath ENDSWITH "-iphonesimulator.so")',
+            ' AND (senderImagePath ENDSWITH "-iphonesimulator.so"'
+            ' OR senderImagePath ENDSWITH "-iphonesimulator.dylib"))',
         ],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
@@ -1471,7 +1480,8 @@ def test_run_app_test_mode_with_passthrough(run_command, first_app_config, tmp_p
             "--predicate",
             'senderImagePath ENDSWITH "/First App"'
             ' OR (processImagePath ENDSWITH "/First App"'
-            ' AND senderImagePath ENDSWITH "-iphonesimulator.so")',
+            ' AND (senderImagePath ENDSWITH "-iphonesimulator.so"'
+            ' OR senderImagePath ENDSWITH "-iphonesimulator.dylib"))',
         ],
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,

diff --git a/tests/platforms/macOS/test_macOS_log_clean_filter.py b/tests/platforms/macOS/test_macOS_log_clean_filter.py
@@ -26,7 +26,8 @@
         (
             'Filtering the log data using "senderImagePath ENDSWITH "/Toga Test!" '
             'OR (processImagePath ENDSWITH "/Toga Test!" '
-            'AND senderImagePath ENDSWITH "-iphonesimulator.so")"',
+            'AND (senderImagePath ENDSWITH "-iphonesimulator.so" '
+            'OR senderImagePath ENDSWITH "-iphonesimulator.dylib"))"',
             None,
         ),
         # Startup log
@@ -49,7 +50,7 @@
             "2022-11-14 13:21:15.341 Df My App[59972:780a15] (libffi.dylib) ",
             ("", True),
         ),
-        # macOS App log
+        # iOS App log (old style .so libraries)
         (
             "2022-11-14 13:21:15.341 Df My App[59972:780a15] (_ctypes.cpython-312-iphonesimulator.so) Hello World!",
             ("Hello World!", True),
@@ -58,7 +59,16 @@
             "2022-11-14 13:21:15.341 Df My App[59972:780a15] (_ctypes.cpython-38-iphonesimulator.so) Hello World!",
             ("Hello World!", True),
         ),
-        # Empty macOS App log
+        # iOS App log
+        (
+            "2022-11-14 13:21:15.341 Df My App[59972:780a15] (_ctypes.cpython-312-iphonesimulator.dylib) Hello World!",
+            ("Hello World!", True),
+        ),
+        (
+            "2022-11-14 13:21:15.341 Df My App[59972:780a15] (_ctypes.cpython-38-iphonesimulator.dylib) Hello World!",
+            ("Hello World!", True),
+        ),
+        # Empty iOS App log (old style .so binaries)
         (
             "2022-11-14 13:21:15.341 Df My App[59972:780a15] (_ctypes.cpython-312-iphonesimulator.so) ",
             ("", True),
@@ -67,6 +77,15 @@
             "2022-11-14 13:21:15.341 Df My App[59972:780a15] (_ctypes.cpython-38-iphonesimulator.so) ",
             ("", True),
         ),
+        # Empty iOS App log
+        (
+            "2022-11-14 13:21:15.341 Df My App[59972:780a15] (_ctypes.cpython-312-iphonesimulator.dylib) ",
+            ("", True),
+        ),
+        (
+            "2022-11-14 13:21:15.341 Df My App[59972:780a15] (_ctypes.cpython-38-iphonesimulator.dylib) ",
+            ("", True),
+        ),
         # Unknown content
         (
             "This doesn't match the regex",
@@ -83,6 +102,12 @@
             "A problem (foo.so) try to avoid it",
             ("A problem (foo.so) try to avoid it", True),
         ),
+        # Log content that contains `.dylib`
+        (
+            "2022-11-14 13:21:15.341 Df My App[59972:780a15] (_ctypes.cpython-312-iphonesimulator.dylib) "
+            "A problem (foo.dylib) try to avoid it",
+            ("A problem (foo.dylib) try to avoid it", True),
+        ),
     ],
 )
 def test_filter(original, filtered):