Changeset 245800 in webkit

Timestamp:

May 27, 2019 2:51:40 PM (5 years ago)

Author:

Tadeu Zagallo

Message:

Fix opensource build of testapi
​https://bugs.webkit.org/show_bug.cgi?id=198256

Reviewed by Alexey Proskuryakov.

In r245564, we added custom entitlements to testapi to allow caching
bytecode in data vaults, but we should only use the entitlements for
internal builds. Otherwises, testapi gets killed on launch. Also fix the
formatting for the errors added in the same patch, according to comments
in the bug after the patch had already landed.

• API/JSScript.mm:

(validateBytecodeCachePath):

• Configurations/ToolExecutable.xcconfig:

Location:

trunk/Source/JavaScriptCore

Files:

• API/JSScript.mm (modified) (3 diffs)
• ChangeLog (modified) (1 diff)
• Configurations/ToolExecutable.xcconfig (modified) (1 diff)

trunk/Source/JavaScriptCore/API/JSScript.mm

@@ -78 +78 @@
     if (auto metadata = FileSystem::fileMetadata(systemPath)) {
         if (metadata->type != FileMetadata::Type::File) {
-            createError([NSString stringWithFormat:@"Cache path `%s` already exists and is not a file", systemPath.utf8().data()], error);
+            createError([NSString stringWithFormat:@"Cache path `%@` already exists and is not a file", static_cast<NSString *>(systemPath)], error);
             return false;
         }
@@ -85 +85 @@
     String directory = FileSystem::directoryName(systemPath);
     if (directory.isNull()) {
-        createError([NSString stringWithFormat:@"Cache path `%s` does not contain in a valid directory", systemPath.utf8().data()], error);
+        createError([NSString stringWithFormat:@"Cache path `%@` does not contain in a valid directory", static_cast<NSString *>(systemPath)], error);
         return false;
     }
 
     if (!FileSystem::fileIsDirectory(directory, FileSystem::ShouldFollowSymbolicLinks::No)) {
-        createError([NSString stringWithFormat:@"Cache directory `%s` is not a directory or does not exist", directory.utf8().data()], error);
+        createError([NSString stringWithFormat:@"Cache directory `%@` is not a directory or does not exist", static_cast<NSString *>(directory)], error);
         return false;
     }
@@ -96 +96 @@
 #if USE(APPLE_INTERNAL_SDK)
     if (rootless_check_datavault_flag(FileSystem::fileSystemRepresentation(directory).data(), nullptr)) {
-        createError([NSString stringWithFormat:@"Cache directory `%s` is not a data vault", directory.utf8().data()], error);
+        createError([NSString stringWithFormat:@"Cache directory `%@` is not a data vault", static_cast<NSString *>(directory)], error);
         return false;
     }

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2019-05-27  Tadeu Zagallo  <tzagallo@apple.com>
+
+        Fix opensource build of testapi
+        https://bugs.webkit.org/show_bug.cgi?id=198256
+
+        Reviewed by Alexey Proskuryakov.
+
+        In r245564, we added custom entitlements to testapi to allow caching
+        bytecode in data vaults, but we should only use the entitlements for
+        internal builds. Otherwises, testapi gets killed on launch. Also fix the
+        formatting for the errors added in the same patch, according to comments
+        in the bug after the patch had already landed.
+
+        * API/JSScript.mm:
+        (validateBytecodeCachePath):
+        * Configurations/ToolExecutable.xcconfig:
+
 2019-05-25  Tadeu Zagallo  <tzagallo@apple.com>
 

trunk/Source/JavaScriptCore/Configurations/ToolExecutable.xcconfig

@@ -44 +44 @@
 CODE_SIGN_IDENTITY_YES = $(WK_ENGINEERING_CODE_SIGN_IDENTITY);
 
-CODE_SIGN_ENTITLEMENTS[sdk=macosx*] = $(CODE_SIGN_ENTITLEMENTS_macosx_$(TARGET_NAME));
-CODE_SIGN_ENTITLEMENTS_macosx_testapi = testapi.entitlements;
+CODE_SIGN_ENTITLEMENTS[sdk=macosx*] = $(CODE_SIGN_ENTITLEMENTS_macosx_$(TARGET_NAME)_$(USE_INTERNAL_SDK));
+CODE_SIGN_ENTITLEMENTS_macosx_testapi_YES = testapi.entitlements;
 
 CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = $(CODE_SIGN_ENTITLEMENTS_ios_$(TARGET_NAME));