Build fix.
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Apr 2016 18:33:29 +0000 (18:33 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 15 Apr 2016 18:33:29 +0000 (18:33 +0000)
* LayoutTestRelay/LayoutTestRelay/main.m: Allow some deprecated methods.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@199600 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/LayoutTestRelay/LayoutTestRelay/main.m

index c0f9b6a..cbbc4af 100644 (file)
@@ -1,3 +1,9 @@
+2016-04-15  Alexey Proskuryakov  <ap@apple.com>
+
+        Build fix.
+
+        * LayoutTestRelay/LayoutTestRelay/main.m: Allow some deprecated methods.
+
 2016-04-14  Alexey Proskuryakov  <ap@apple.com>
 
         Some GuardMalloc bots are not happy when running many parallel processes
index 36d61fb..4966a94 100644 (file)
@@ -48,6 +48,8 @@ SimDevice *getTestingSimDevice(SimDeviceType *deviceType, SimRuntime *runtime, N
     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;
@@ -55,6 +57,7 @@ SimDevice *getTestingSimDevice(SimDeviceType *deviceType, SimRuntime *runtime, N
 
     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]);
@@ -119,14 +122,20 @@ int main(int argc, const char * argv[])
         }
         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);