Title: [220536] trunk/Tools
Revision
220536
Author
jiewen_...@apple.com
Date
2017-08-10 11:47:56 -0700 (Thu, 10 Aug 2017)

Log Message

[WebCrypto] Enable SerializedCryptoKeyWrapTest in iOS
https://bugs.webkit.org/show_bug.cgi?id=175344
<rdar://problem/28507240>

Reviewed by Alexey Proskuryakov.

Add entitlements to TestWebKitAPI project for iOS. Then add Keychain Access entitlement to the project.
Finally enable the existing tests for iOS.

* TestWebKitAPI/Configurations/TestWebKitAPI-iOS.entitlements: Added.
* TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WebCore/cocoa/SerializedCryptoKeyWrap.mm:

Modified Paths

Added Paths

Diff

Modified: trunk/Tools/ChangeLog (220535 => 220536)


--- trunk/Tools/ChangeLog	2017-08-10 18:27:01 UTC (rev 220535)
+++ trunk/Tools/ChangeLog	2017-08-10 18:47:56 UTC (rev 220536)
@@ -1,3 +1,19 @@
+2017-08-08  Jiewen Tan  <jiewen_...@apple.com>
+
+        [WebCrypto] Enable SerializedCryptoKeyWrapTest in iOS
+        https://bugs.webkit.org/show_bug.cgi?id=175344
+        <rdar://problem/28507240>
+
+        Reviewed by Alexey Proskuryakov.
+
+        Add entitlements to TestWebKitAPI project for iOS. Then add Keychain Access entitlement to the project.
+        Finally enable the existing tests for iOS.
+
+        * TestWebKitAPI/Configurations/TestWebKitAPI-iOS.entitlements: Added.
+        * TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig:
+        * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+        * TestWebKitAPI/Tests/WebCore/cocoa/SerializedCryptoKeyWrap.mm:
+
 2017-08-10  Lucas Forschler  <lforsch...@apple.com>
 
         Write a tool to bisect WebKit builds

Added: trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI-iOS.entitlements (0 => 220536)


--- trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI-iOS.entitlements	                        (rev 0)
+++ trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI-iOS.entitlements	2017-08-10 18:47:56 UTC (rev 220536)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>com.apple.TestWebKitAPI</string>
+	</array>
+</dict>
+</plist>

Modified: trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig (220535 => 220536)


--- trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig	2017-08-10 18:27:01 UTC (rev 220535)
+++ trunk/Tools/TestWebKitAPI/Configurations/TestWebKitAPI.xcconfig	2017-08-10 18:47:56 UTC (rev 220536)
@@ -35,3 +35,5 @@
 OTHER_LDFLAGS_PLATFORM[sdk=iphone*] = -framework WebCore -framework CoreGraphics -framework UIKit -framework MobileCoreServices;
 
 LD_RUNPATH_SEARCH_PATHS = "@loader_path";
+
+CODE_SIGN_ENTITLEMENTS[sdk=iphone*] = Configurations/TestWebKitAPI-iOS.entitlements;

Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (220535 => 220536)


--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj	2017-08-10 18:27:01 UTC (rev 220535)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj	2017-08-10 18:47:56 UTC (rev 220536)
@@ -1267,6 +1267,7 @@
 		5714ECBA1CA8BFD100051AC8 /* DownloadRequestOriginalURLFrame.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = DownloadRequestOriginalURLFrame.html; sourceTree = "<group>"; };
 		5714ECBC1CA8C21800051AC8 /* DownloadRequestOriginalURL2.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = DownloadRequestOriginalURL2.html; sourceTree = "<group>"; };
 		571F7FCF1F2961E100946648 /* IndexedDBStructuredCloneBackwardCompatibility.sqlite3-wal */ = {isa = PBXFileReference; lastKnownFileType = file; path = "IndexedDBStructuredCloneBackwardCompatibility.sqlite3-wal"; sourceTree = "<group>"; };
+		5735F0251F3A4EA6000EE801 /* TestWebKitAPI-iOS.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = "TestWebKitAPI-iOS.entitlements"; sourceTree = "<group>"; };
 		57599E201F07191700A3FB8C /* IndexedDBStructuredCloneBackwardCompatibility.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; path = IndexedDBStructuredCloneBackwardCompatibility.mm; sourceTree = "<group>"; };
 		57599E231F07192C00A3FB8C /* IndexedDBStructuredCloneBackwardCompatibilityWrite.html */ = {isa = PBXFileReference; lastKnownFileType = text.html; path = IndexedDBStructuredCloneBackwardCompatibilityWrite.html; sourceTree = "<group>"; };
 		57599E241F07192C00A3FB8C /* IndexedDBStructuredCloneBackwardCompatibility.sqlite3 */ = {isa = PBXFileReference; lastKnownFileType = file; path = IndexedDBStructuredCloneBackwardCompatibility.sqlite3; sourceTree = "<group>"; };
@@ -2255,6 +2256,7 @@
 				BC90957F12554CF900083756 /* DebugRelease.xcconfig */,
 				CD773F711C5057DB0002257C /* FeatureDefines.xcconfig */,
 				BC575AE2126E88B1006F0F12 /* InjectedBundle.xcconfig */,
+				5735F0251F3A4EA6000EE801 /* TestWebKitAPI-iOS.entitlements */,
 				BC90958012554CF900083756 /* TestWebKitAPI.xcconfig */,
 				7CCE7EA31A4115CB00447C4C /* TestWebKitAPILibrary.xcconfig */,
 				7C83E0261D0A5B8D00FEBCF3 /* TestWTF.xcconfig */,

Modified: trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SerializedCryptoKeyWrap.mm (220535 => 220536)


--- trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SerializedCryptoKeyWrap.mm	2017-08-10 18:27:01 UTC (rev 220535)
+++ trunk/Tools/TestWebKitAPI/Tests/WebCore/cocoa/SerializedCryptoKeyWrap.mm	2017-08-10 18:47:56 UTC (rev 220536)
@@ -30,9 +30,6 @@
 
 namespace TestWebKitAPI {
 
-// TODO: We should enable the following tests on iOS simulator once <rdar://problem/28534666> is fixed.
-// A seperate bug is filed about this: <rdar://problem/28507240>.
-#if !PLATFORM(IOS)
 class SerializedCryptoKeyWrapTest : public testing::Test {
 public:
     virtual void SetUp()
@@ -96,6 +93,5 @@
     EXPECT_TRUE(WebCore::unwrapSerializedCryptoKey(masterKey, wrappedKey, unwrappedKey));
     EXPECT_TRUE(unwrappedKey == cryptoKey);
 }
-#endif
 
 } // namespace TestWebKitAPI
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to