From 19bc559440f82f18339e1ff368feb619919333db Mon Sep 17 00:00:00 2001 From: Andrzej Kotulski Date: Tue, 5 Apr 2016 04:30:32 -0700 Subject: [PATCH] Don't skip objc tests on unknown versions of xcode Reviewed By: dulmarod Differential Revision: D3138614 fb-gh-sync-id: 6e82a2c fbshipit-source-id: 6e82a2c --- infer/tests/frontend/objc/BlockTest.java | 1 - infer/tests/frontend/objc/NSAssertTest.java | 1 - infer/tests/utils/InferRunner.java | 6 ------ 3 files changed, 8 deletions(-) diff --git a/infer/tests/frontend/objc/BlockTest.java b/infer/tests/frontend/objc/BlockTest.java index 9fe02990c..638cc29bd 100644 --- a/infer/tests/frontend/objc/BlockTest.java +++ b/infer/tests/frontend/objc/BlockTest.java @@ -76,7 +76,6 @@ public class BlockTest { public void whenCaptureRunOnBlockReleaseThenDotFilesAreTheSame() throws InterruptedException, IOException, InferException { - Assume.assumeTrue(InferRunner.runsSupportedXCode()); String block_src = "infer/tests/codetoanalyze/objc/frontend/block/block_release.m"; diff --git a/infer/tests/frontend/objc/NSAssertTest.java b/infer/tests/frontend/objc/NSAssertTest.java index 873157c3d..928bf492b 100644 --- a/infer/tests/frontend/objc/NSAssertTest.java +++ b/infer/tests/frontend/objc/NSAssertTest.java @@ -36,7 +36,6 @@ public class NSAssertTest { public void whenCaptureRunOnPropertyThenDotFilesAreTheSame() throws InterruptedException, IOException, InferException { - Assume.assumeTrue(InferRunner.runsSupportedXCode()); String src = "infer/tests/codetoanalyze/objc/frontend/assertions/NSAssert_example.m"; String dotty = "infer/tests/codetoanalyze/objc/frontend/assertions/NSAssert_example.dot"; diff --git a/infer/tests/utils/InferRunner.java b/infer/tests/utils/InferRunner.java index 948bc60fb..064a98006 100644 --- a/infer/tests/utils/InferRunner.java +++ b/infer/tests/utils/InferRunner.java @@ -58,8 +58,6 @@ public class InferRunner { private static final String IPHONESIMULATOR_ISYSROOT_SUFFIX = "/Platforms/iPhoneSimulator.platform/Developer/SDKs/iPhoneSimulator.sdk"; - private static final String CURRENT_XCODE_VERSION = "Xcode 7.0"; - private static HashMap inferResultsMap = new HashMap(); @@ -88,10 +86,6 @@ public class InferRunner { return line; } - public static boolean runsSupportedXCode() throws IOException, InterruptedException { - return InferRunner.getXCodeVersion().equals(CURRENT_XCODE_VERSION); - } - private static ImmutableList createInferJavaCommand( TemporaryFolder folder, ImmutableList sourceFiles,