Title: [206452] trunk/Tools
- Revision
- 206452
- Author
- ander...@apple.com
- Date
- 2016-09-27 12:32:28 -0700 (Tue, 27 Sep 2016)
Log Message
Turns out OptionSet.cpp wasn't added to the right target. Add it and fix the build for real.
* TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
* TestWebKitAPI/Tests/WTF/OptionSet.cpp:
(TestWebKitAPI::TEST):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (206451 => 206452)
--- trunk/Tools/ChangeLog 2016-09-27 19:26:13 UTC (rev 206451)
+++ trunk/Tools/ChangeLog 2016-09-27 19:32:28 UTC (rev 206452)
@@ -1,5 +1,13 @@
2016-09-27 Anders Carlsson <ander...@apple.com>
+ Turns out OptionSet.cpp wasn't added to the right target. Add it and fix the build for real.
+
+ * TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj:
+ * TestWebKitAPI/Tests/WTF/OptionSet.cpp:
+ (TestWebKitAPI::TEST):
+
+2016-09-27 Anders Carlsson <ander...@apple.com>
+
Try to fix the GTK+ build.
* TestWebKitAPI/Tests/WTF/OptionSet.cpp:
Modified: trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj (206451 => 206452)
--- trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-09-27 19:26:13 UTC (rev 206451)
+++ trunk/Tools/TestWebKitAPI/TestWebKitAPI.xcodeproj/project.pbxproj 2016-09-27 19:32:28 UTC (rev 206452)
@@ -31,6 +31,7 @@
1A4F81CF1BDFFD53004E672E /* RemoteObjectRegistryPlugIn.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1A4F81CD1BDFFD53004E672E /* RemoteObjectRegistryPlugIn.mm */; };
1A50AA201A2A51FC00F4C345 /* close-from-within-create-page.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A50AA1F1A2A4EA500F4C345 /* close-from-within-create-page.html */; };
1A63479F183D72A4005B1707 /* all-content-in-one-iframe.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 93D3D19B17B1A7B000C7C415 /* all-content-in-one-iframe.html */; };
+ 1A77BAA31D9AFFFC005FC568 /* OptionSet.cpp in Sources */ = {isa = PBXBuildFile; fileRef = CE50D8C81C8665CE0072EA5A /* OptionSet.cpp */; };
1A7E8B3618120B2F00AEB74A /* FragmentNavigation.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = 1A7E8B351812093600AEB74A /* FragmentNavigation.html */; };
1A9E52C913E65EF4006917F5 /* 18-characters.html in Copy Resources */ = {isa = PBXBuildFile; fileRef = C045F9461385C2F800C0F3CD /* 18-characters.html */; };
1ADAD1501D77A9F600212586 /* BlockPtr.mm in Sources */ = {isa = PBXBuildFile; fileRef = 1ADAD14E1D77A9F600212586 /* BlockPtr.mm */; };
@@ -2221,6 +2222,7 @@
7C83DE991D0A590C00FEBCF3 /* AtomicString.cpp in Sources */,
7C83DE9C1D0A590C00FEBCF3 /* BloomFilter.cpp in Sources */,
7C83DEA01D0A590C00FEBCF3 /* CheckedArithmeticOperations.cpp in Sources */,
+ 1A77BAA31D9AFFFC005FC568 /* OptionSet.cpp in Sources */,
7C83DEC31D0A590C00FEBCF3 /* Condition.cpp in Sources */,
1A3524AE1D63A4FB0031729B /* Scope.cpp in Sources */,
7C83DEA61D0A590C00FEBCF3 /* Counters.cpp in Sources */,
Modified: trunk/Tools/TestWebKitAPI/Tests/WTF/OptionSet.cpp (206451 => 206452)
--- trunk/Tools/TestWebKitAPI/Tests/WTF/OptionSet.cpp 2016-09-27 19:26:13 UTC (rev 206451)
+++ trunk/Tools/TestWebKitAPI/Tests/WTF/OptionSet.cpp 2016-09-27 19:32:28 UTC (rev 206452)
@@ -64,8 +64,8 @@
{
OptionSet<ExampleFlags> set { ExampleFlags::A, ExampleFlags::B };
- EXPECT_TRUE(set == ({ ExampleFlags::A, ExampleFlags::B }));
- EXPECT_TRUE(set == ({ ExampleFlags::B, ExampleFlags::A }));
+ EXPECT_TRUE((set == OptionSet<ExampleFlags> { ExampleFlags::A, ExampleFlags::B }));
+ EXPECT_TRUE((set == OptionSet<ExampleFlags> { ExampleFlags::B, ExampleFlags::A }));
EXPECT_FALSE(set == ExampleFlags::B);
}
@@ -73,16 +73,16 @@
{
OptionSet<ExampleFlags> set = ExampleFlags::A;
- EXPECT_TRUE(set != ExampleFlags::A);
EXPECT_TRUE(set != ExampleFlags::B);
+ EXPECT_FALSE(set != ExampleFlags::A);
}
TEST(WTF_OptionSet, Minus)
{
- OptionSet<ExampleFlags> set { ExampleFlags::A, ExampleFlags:B, ExampleFlags::C };
+ OptionSet<ExampleFlags> set { ExampleFlags::A, ExampleFlags::B, ExampleFlags::C };
- EXPECT_TRUE((set - ExampleFlags::A) == ({ ExampleFlags::B, ExampleFlags::C }));
- EXPECT_TRUE((set - ExampleFlags::D) == ({ ExampleFlags::A, ExampleFlags::B, ExampleFlags::C }));
+ EXPECT_TRUE(((set - ExampleFlags::A) == OptionSet<ExampleFlags> { ExampleFlags::B, ExampleFlags::C }));
+ EXPECT_TRUE(((set - ExampleFlags::D) == OptionSet<ExampleFlags> { ExampleFlags::A, ExampleFlags::B, ExampleFlags::C }));
EXPECT_TRUE((set - set).isEmpty());
}
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
