Changeset 285870 in webkit

Timestamp:

Nov 16, 2021, 9:39:10 AM (5 years ago)

Author:

beidson@apple.com

Message:

Enable webpushd tests in the iOS simulator.
​https://bugs.webkit.org/show_bug.cgi?id=233149

Reviewed by Alex Christensen.

• TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm:

(TestWebKitAPI::testWebPushDaemonPList): Add a key to allow an OSLaunchdJob executable to break out of the simulator runtime root.

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm (modified) (5 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-11-16  Brady Eidson  <beidson@apple.com>
+
+        Enable webpushd tests in the iOS simulator.
+        https://bugs.webkit.org/show_bug.cgi?id=233149
+
+        Reviewed by Alex Christensen.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm:
+        (TestWebKitAPI::testWebPushDaemonPList): Add a key to allow an OSLaunchdJob executable to break out of the simulator runtime root.
+
 2021-11-16  Tyler Wilcock  <tyler_w@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WebPushDaemon.mm

@@ -33 +33 @@
 #import <WebKit/_WKExperimentalFeature.h>
 
-// FIXME: These tests are still currently disabled on iOS while tooling issues with `run-api-tests` are resolved.
-#if PLATFORM(MAC)
+#if PLATFORM(MAC) || PLATFORM(IOS)
 
 static bool alertReceived = false;
@@ -66 +65 @@
 static RetainPtr<xpc_object_t> testWebPushDaemonPList(NSURL *storageLocation)
 {
+    auto currentDirectory = currentExecutableDirectory();
+
     auto plist = adoptNS(xpc_dictionary_create(nullptr, nullptr, 0));
     xpc_dictionary_set_string(plist.get(), "_ManagedBy", "TestWebKitAPI");
     xpc_dictionary_set_string(plist.get(), "Label", "org.webkit.webpushtestdaemon");
     xpc_dictionary_set_bool(plist.get(), "LaunchOnlyOnce", true);
+    xpc_dictionary_set_bool(plist.get(), "RootedSimulatorPath", true);
     xpc_dictionary_set_string(plist.get(), "StandardErrorPath", [storageLocation URLByAppendingPathComponent:@"daemon_stderr"].path.fileSystemRepresentation);
 
     {
         auto environmentVariables = adoptNS(xpc_dictionary_create(nullptr, nullptr, 0));
-        xpc_dictionary_set_string(environmentVariables.get(), "DYLD_FRAMEWORK_PATH", currentExecutableDirectory().get().fileSystemRepresentation);
+        xpc_dictionary_set_string(environmentVariables.get(), "DYLD_FRAMEWORK_PATH", currentDirectory.get().fileSystemRepresentation);
         xpc_dictionary_set_value(plist.get(), "EnvironmentVariables", environmentVariables.get());
     }
@@ -88 +90 @@
         xpc_array_set_string(programArguments.get(), XPC_ARRAY_APPEND, executableLocation.get().fileSystemRepresentation);
 #else
-        // FIXME: These tests are still currently disabled on iOS while tooling issues with `run-api-tests` are resolved.
-        // Once enabled, this patch must point to the webpushd executable at a path that exists within
-        // the simulator runtime root.
-        xpc_array_set_string(programArguments.get(), XPC_ARRAY_APPEND, "/usr/local/bin/webkit-testing/webpushd");
+        xpc_array_set_string(programArguments.get(), XPC_ARRAY_APPEND, [currentDirectory URLByAppendingPathComponent:@"webpushd"].path.fileSystemRepresentation);
 #endif
         xpc_array_set_string(programArguments.get(), XPC_ARRAY_APPEND, "--machServiceName");
@@ -145 +144 @@
     killFirstInstanceOfDaemon(@"webpushd");
 
-    EXPECT_TRUE([[NSFileManager defaultManager] fileExistsAtPath:tempDir.path]);
+    if (![[NSFileManager defaultManager] fileExistsAtPath:tempDir.path])
+        return;
+
     NSError *error = nil;
     [[NSFileManager defaultManager] removeItemAtURL:tempDir error:&error];
+
+    if (error)
+        NSLog(@"Error removing tempDir URL: %@", error);
+
     EXPECT_NULL(error);
 }
@@ -264 +269 @@
 } // namespace TestWebKitAPI
 
-#endif // PLATFORM(MAC)
+#endif // PLATFORM(MAC) || PLATFORM(IOS)