Title: [199610] trunk/Tools
- Revision
- 199610
- Author
- [email protected]
- Date
- 2016-04-15 14:09:21 -0700 (Fri, 15 Apr 2016)
Log Message
Unreviewed, rolling out r199600.
https://bugs.webkit.org/show_bug.cgi?id=156642
It didn't help (Requested by ap_ on #webkit).
Reverted changeset:
"Build fix."
http://trac.webkit.org/changeset/199600
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (199609 => 199610)
--- trunk/Tools/ChangeLog 2016-04-15 20:57:15 UTC (rev 199609)
+++ trunk/Tools/ChangeLog 2016-04-15 21:09:21 UTC (rev 199610)
@@ -1,3 +1,15 @@
+2016-04-15 Commit Queue <[email protected]>
+
+ Unreviewed, rolling out r199600.
+ https://bugs.webkit.org/show_bug.cgi?id=156642
+
+ It didn't help (Requested by ap_ on #webkit).
+
+ Reverted changeset:
+
+ "Build fix."
+ http://trac.webkit.org/changeset/199600
+
2016-04-15 Alexey Proskuryakov <[email protected]>
Build fix.
Modified: trunk/Tools/LayoutTestRelay/LayoutTestRelay/main.m (199609 => 199610)
--- trunk/Tools/LayoutTestRelay/LayoutTestRelay/main.m 2016-04-15 20:57:15 UTC (rev 199609)
+++ trunk/Tools/LayoutTestRelay/LayoutTestRelay/main.m 2016-04-15 21:09:21 UTC (rev 199610)
@@ -48,8 +48,6 @@
NSString *deviceName = [[[[deviceType identifier] componentsSeparatedByString:@"."] lastObject] stringByReplacingOccurrencesOfString:@"-" withString:@" "];
deviceName = [NSString stringWithFormat:@"%@%@%@", deviceName, @" WebKit Tester", suffix];
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
for (SimDevice *device in [[SimDeviceSet defaultSet] devices]) {
if ([[device name] isEqualToString:deviceName] && [[device deviceType] isEqualTo:deviceType] && [[device runtime] isEqualTo:runtime])
return device;
@@ -57,7 +55,6 @@
NSError *error;
SimDevice *device = [[SimDeviceSet defaultSet] createDeviceWithType:deviceType runtime:runtime name:deviceName error:&error];
-#pragma clang diagnostic pop
if (error) {
NSLog(@"Couldn't create device: %@", [error description]);
@@ -122,20 +119,14 @@
}
NSString *appPath = getRequiredStringArgument(@"app");
NSString *runtimeIdentifier = getRequiredStringArgument(@"runtime");
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
SimRuntime *runtime = [SimRuntime supportedRuntimesByIdentifier][runtimeIdentifier];
-#pragma clang diagnostic pop
if (!runtime) {
NSLog(@"There is no supported runtime \"%@\"", runtimeIdentifier);
exit(EXIT_FAILURE);
}
NSString *deviceTypeIdentifier = getRequiredStringArgument(@"deviceType");
-#pragma clang diagnostic push
-#pragma clang diagnostic ignored "-Wdeprecated-declarations"
SimDeviceType *deviceType = [SimDeviceType supportedDeviceTypesByIdentifier][deviceTypeIdentifier];
-#pragma clang diagnostic pop
if (!deviceType) {
NSLog(@"There is no supported device type \"%@\"", deviceTypeIdentifier);
exit(EXIT_FAILURE);
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes