Skip to content

Commit 7e2b7cf

Browse files
michaelklishinmichaelklishin
committed
Make TLS tests conditional
gmake tests and the RMQClient scheme no longer run TLS integration tests. There's another scheme (and make target) that do.
1 parent 2a3eb68 commit 7e2b7cf

File tree

5 files changed

+450
-2
lines changed

5 files changed

+450
-2
lines changed

‎Makefile

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ tests_ios: tests_iOS
1111

1212
tests_macos: tests_MacOS
1313

14+
tests_with_tls: tests_iOS_with_tls tests_macos_with_tls lint
15+
1416
tests_iOS: test_dependencies
1517
set -o pipefail && \
1618
xcodebuild test \
@@ -19,6 +21,14 @@ tests_iOS: test_dependencies
1921
-destination 'platform=iOS Simulator,name=iPhone XR,OS=$(iOS_VERSION)' | \
2022
xcpretty
2123

24+
tests_iOS_with_tls: test_dependencies
25+
set -o pipefail && \
26+
xcodebuild test \
27+
-project RMQClient.xcodeproj \
28+
-scheme "RMQClient with TLS tests" \
29+
-destination 'platform=iOS Simulator,name=iPhone XR,OS=$(iOS_VERSION)' | \
30+
xcpretty
31+
2232
tests_MacOS: test_dependencies
2333
set -o pipefail && \
2434
xcodebuild test \
@@ -27,6 +37,14 @@ tests_MacOS: test_dependencies
2737
-destination 'platform=OS X,arch=x86_64' | \
2838
xcpretty
2939

40+
tests_MacOS_with_tls: test_dependencies
41+
set -o pipefail && \
42+
xcodebuild test \
43+
-project RMQClient.xcodeproj \
44+
-scheme "RMQClient with TLS tests" \
45+
-destination 'platform=OS X,arch=x86_64' | \
46+
xcpretty
47+
3048
test_dependencies: bootstrap
3149
gem list -i xcpretty || gem install xcpretty
3250

‎RMQClient.xcodeproj/project.pbxproj

Lines changed: 294 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1317,6 +1317,286 @@
13171317
/* End PBXTargetDependency section */
13181318

13191319
/* Begin XCBuildConfiguration section */
1320+
70338A2721FBBB0D00C9069D /* Test without TLS */ = {
1321+
isa = XCBuildConfiguration;
1322+
buildSettings = {
1323+
ALWAYS_SEARCH_USER_PATHS = NO;
1324+
"ARCHS[sdk=iphonesimulator*]" = (
1325+
"$(ARCHS_STANDARD)",
1326+
arm64,
1327+
);
1328+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
1329+
CLANG_CXX_LIBRARY = "libc++";
1330+
CLANG_ENABLE_MODULES = YES;
1331+
CLANG_ENABLE_OBJC_ARC = YES;
1332+
CLANG_UNDEFINED_BEHAVIOR_SANITIZER_INTEGER = YES;
1333+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
1334+
CLANG_WARN_BOOL_CONVERSION = YES;
1335+
CLANG_WARN_COMMA = YES;
1336+
CLANG_WARN_CONSTANT_CONVERSION = YES;
1337+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
1338+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
1339+
CLANG_WARN_EMPTY_BODY = YES;
1340+
CLANG_WARN_ENUM_CONVERSION = YES;
1341+
CLANG_WARN_INFINITE_RECURSION = YES;
1342+
CLANG_WARN_INT_CONVERSION = YES;
1343+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1344+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1345+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
1346+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1347+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1348+
CLANG_WARN_STRICT_PROTOTYPES = YES;
1349+
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO;
1350+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
1351+
CLANG_WARN_UNREACHABLE_CODE = YES;
1352+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1353+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1354+
COPY_PHASE_STRIP = NO;
1355+
CURRENT_PROJECT_VERSION = 11;
1356+
DEBUG_INFORMATION_FORMAT = dwarf;
1357+
ENABLE_STRICT_OBJC_MSGSEND = YES;
1358+
ENABLE_TESTABILITY = YES;
1359+
FRAMEWORK_SEARCH_PATHS = (
1360+
"$(SDKROOT)",
1361+
"$(inherited)",
1362+
);
1363+
GCC_C_LANGUAGE_STANDARD = gnu99;
1364+
GCC_DYNAMIC_NO_PIC = NO;
1365+
GCC_NO_COMMON_BLOCKS = YES;
1366+
GCC_OPTIMIZATION_LEVEL = 0;
1367+
GCC_PREPROCESSOR_DEFINITIONS = (
1368+
"DEBUG=1",
1369+
"$(inherited)",
1370+
);
1371+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
1372+
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
1373+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
1374+
GCC_WARN_UNDECLARED_SELECTOR = YES;
1375+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
1376+
GCC_WARN_UNUSED_FUNCTION = YES;
1377+
GCC_WARN_UNUSED_PARAMETER = NO;
1378+
GCC_WARN_UNUSED_VARIABLE = YES;
1379+
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
1380+
MACOSX_DEPLOYMENT_TARGET = 10.12;
1381+
MTL_ENABLE_DEBUG_INFO = YES;
1382+
ONLY_ACTIVE_ARCH = YES;
1383+
OTHER_SWIFT_FLAGS = "";
1384+
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
1385+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
1386+
SWIFT_VERSION = 4.2;
1387+
TARGETED_DEVICE_FAMILY = "1,2";
1388+
VALIDATE_PRODUCT = NO;
1389+
VERSIONING_SYSTEM = "apple-generic";
1390+
VERSION_INFO_PREFIX = "";
1391+
};
1392+
name = "Test without TLS";
1393+
};
1394+
70338A2821FBBB0D00C9069D /* Test without TLS */ = {
1395+
isa = XCBuildConfiguration;
1396+
buildSettings = {
1397+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
1398+
DEFINES_MODULE = YES;
1399+
DYLIB_COMPATIBILITY_VERSION = 1;
1400+
DYLIB_CURRENT_VERSION = 8;
1401+
DYLIB_INSTALL_NAME_BASE = "@rpath";
1402+
INFOPLIST_FILE = RMQClient/Info.plist;
1403+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1404+
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
1405+
LD_RUNPATH_SEARCH_PATHS = (
1406+
"$(inherited)",
1407+
"@executable_path/Frameworks",
1408+
"@loader_path/Frameworks",
1409+
"@executable_path/../Frameworks",
1410+
"@loader_path/../Frameworks",
1411+
);
1412+
PRODUCT_BUNDLE_IDENTIFIER = io.pivotal.RMQClient;
1413+
PRODUCT_NAME = "$(TARGET_NAME)";
1414+
SKIP_INSTALL = YES;
1415+
};
1416+
name = "Test without TLS";
1417+
};
1418+
70338A2921FBBB0D00C9069D /* Test without TLS */ = {
1419+
isa = XCBuildConfiguration;
1420+
buildSettings = {
1421+
CLANG_ENABLE_MODULES = YES;
1422+
INFOPLIST_FILE = RMQClientTests/Info.plist;
1423+
LD_RUNPATH_SEARCH_PATHS = (
1424+
"$(inherited)",
1425+
"@executable_path/Frameworks",
1426+
"@loader_path/Frameworks",
1427+
"@executable_path/../Frameworks",
1428+
"@loader_path/../Frameworks",
1429+
);
1430+
PRODUCT_BUNDLE_IDENTIFIER = io.pivotal.RMQClientTests;
1431+
PRODUCT_NAME = "$(TARGET_NAME)";
1432+
SWIFT_OBJC_BRIDGING_HEADER = "RMQClientTests/RMQClientTests-Bridging-Header.h";
1433+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1434+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1435+
SWIFT_VERSION = 4.0;
1436+
};
1437+
name = "Test without TLS";
1438+
};
1439+
70338A2A21FBBB0D00C9069D /* Test without TLS */ = {
1440+
isa = XCBuildConfiguration;
1441+
buildSettings = {
1442+
INFOPLIST_FILE = RMQClientIntegrationTests/Info.plist;
1443+
LD_RUNPATH_SEARCH_PATHS = (
1444+
"$(inherited)",
1445+
"@executable_path/Frameworks",
1446+
"@loader_path/Frameworks",
1447+
"@executable_path/../Frameworks",
1448+
"@loader_path/../Frameworks",
1449+
);
1450+
PRODUCT_BUNDLE_IDENTIFIER = io.pivotal.RMQClientIntegrationTests;
1451+
PRODUCT_NAME = "$(TARGET_NAME)";
1452+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
1453+
SWIFT_OBJC_BRIDGING_HEADER = "RMQClientIntegrationTests/RMQClientIntegrationTests-Bridging-Header.h";
1454+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1455+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1456+
SWIFT_VERSION = 4.2;
1457+
};
1458+
name = "Test without TLS";
1459+
};
1460+
70338A2B21FBBB2000C9069D /* Test with TLS */ = {
1461+
isa = XCBuildConfiguration;
1462+
buildSettings = {
1463+
ALWAYS_SEARCH_USER_PATHS = NO;
1464+
"ARCHS[sdk=iphonesimulator*]" = (
1465+
"$(ARCHS_STANDARD)",
1466+
arm64,
1467+
);
1468+
CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x";
1469+
CLANG_CXX_LIBRARY = "libc++";
1470+
CLANG_ENABLE_MODULES = YES;
1471+
CLANG_ENABLE_OBJC_ARC = YES;
1472+
CLANG_UNDEFINED_BEHAVIOR_SANITIZER_INTEGER = YES;
1473+
CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES;
1474+
CLANG_WARN_BOOL_CONVERSION = YES;
1475+
CLANG_WARN_COMMA = YES;
1476+
CLANG_WARN_CONSTANT_CONVERSION = YES;
1477+
CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES;
1478+
CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR;
1479+
CLANG_WARN_EMPTY_BODY = YES;
1480+
CLANG_WARN_ENUM_CONVERSION = YES;
1481+
CLANG_WARN_INFINITE_RECURSION = YES;
1482+
CLANG_WARN_INT_CONVERSION = YES;
1483+
CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES;
1484+
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
1485+
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
1486+
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
1487+
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
1488+
CLANG_WARN_STRICT_PROTOTYPES = YES;
1489+
CLANG_WARN_SUSPICIOUS_IMPLICIT_CONVERSION = NO;
1490+
CLANG_WARN_SUSPICIOUS_MOVE = YES;
1491+
CLANG_WARN_UNREACHABLE_CODE = YES;
1492+
CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
1493+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
1494+
COPY_PHASE_STRIP = NO;
1495+
CURRENT_PROJECT_VERSION = 11;
1496+
DEBUG_INFORMATION_FORMAT = dwarf;
1497+
ENABLE_STRICT_OBJC_MSGSEND = YES;
1498+
ENABLE_TESTABILITY = YES;
1499+
FRAMEWORK_SEARCH_PATHS = (
1500+
"$(SDKROOT)",
1501+
"$(inherited)",
1502+
);
1503+
GCC_C_LANGUAGE_STANDARD = gnu99;
1504+
GCC_DYNAMIC_NO_PIC = NO;
1505+
GCC_NO_COMMON_BLOCKS = YES;
1506+
GCC_OPTIMIZATION_LEVEL = 0;
1507+
GCC_PREPROCESSOR_DEFINITIONS = (
1508+
"DEBUG=1",
1509+
"$(inherited)",
1510+
);
1511+
GCC_WARN_64_TO_32_BIT_CONVERSION = YES;
1512+
GCC_WARN_ABOUT_MISSING_PROTOTYPES = YES;
1513+
GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR;
1514+
GCC_WARN_UNDECLARED_SELECTOR = YES;
1515+
GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
1516+
GCC_WARN_UNUSED_FUNCTION = YES;
1517+
GCC_WARN_UNUSED_PARAMETER = NO;
1518+
GCC_WARN_UNUSED_VARIABLE = YES;
1519+
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
1520+
MACOSX_DEPLOYMENT_TARGET = 10.12;
1521+
MTL_ENABLE_DEBUG_INFO = YES;
1522+
ONLY_ACTIVE_ARCH = YES;
1523+
OTHER_SWIFT_FLAGS = "-DRUN_TLS_TESTS";
1524+
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
1525+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = RUN_TLS_TESTS;
1526+
SWIFT_VERSION = 4.2;
1527+
TARGETED_DEVICE_FAMILY = "1,2";
1528+
VALIDATE_PRODUCT = NO;
1529+
VERSIONING_SYSTEM = "apple-generic";
1530+
VERSION_INFO_PREFIX = "";
1531+
};
1532+
name = "Test with TLS";
1533+
};
1534+
70338A2C21FBBB2000C9069D /* Test with TLS */ = {
1535+
isa = XCBuildConfiguration;
1536+
buildSettings = {
1537+
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
1538+
DEFINES_MODULE = YES;
1539+
DYLIB_COMPATIBILITY_VERSION = 1;
1540+
DYLIB_CURRENT_VERSION = 8;
1541+
DYLIB_INSTALL_NAME_BASE = "@rpath";
1542+
INFOPLIST_FILE = RMQClient/Info.plist;
1543+
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
1544+
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
1545+
LD_RUNPATH_SEARCH_PATHS = (
1546+
"$(inherited)",
1547+
"@executable_path/Frameworks",
1548+
"@loader_path/Frameworks",
1549+
"@executable_path/../Frameworks",
1550+
"@loader_path/../Frameworks",
1551+
);
1552+
PRODUCT_BUNDLE_IDENTIFIER = io.pivotal.RMQClient;
1553+
PRODUCT_NAME = "$(TARGET_NAME)";
1554+
SKIP_INSTALL = YES;
1555+
};
1556+
name = "Test with TLS";
1557+
};
1558+
70338A2D21FBBB2000C9069D /* Test with TLS */ = {
1559+
isa = XCBuildConfiguration;
1560+
buildSettings = {
1561+
CLANG_ENABLE_MODULES = YES;
1562+
INFOPLIST_FILE = RMQClientTests/Info.plist;
1563+
LD_RUNPATH_SEARCH_PATHS = (
1564+
"$(inherited)",
1565+
"@executable_path/Frameworks",
1566+
"@loader_path/Frameworks",
1567+
"@executable_path/../Frameworks",
1568+
"@loader_path/../Frameworks",
1569+
);
1570+
PRODUCT_BUNDLE_IDENTIFIER = io.pivotal.RMQClientTests;
1571+
PRODUCT_NAME = "$(TARGET_NAME)";
1572+
SWIFT_OBJC_BRIDGING_HEADER = "RMQClientTests/RMQClientTests-Bridging-Header.h";
1573+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1574+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1575+
SWIFT_VERSION = 4.0;
1576+
};
1577+
name = "Test with TLS";
1578+
};
1579+
70338A2E21FBBB2000C9069D /* Test with TLS */ = {
1580+
isa = XCBuildConfiguration;
1581+
buildSettings = {
1582+
INFOPLIST_FILE = RMQClientIntegrationTests/Info.plist;
1583+
LD_RUNPATH_SEARCH_PATHS = (
1584+
"$(inherited)",
1585+
"@executable_path/Frameworks",
1586+
"@loader_path/Frameworks",
1587+
"@executable_path/../Frameworks",
1588+
"@loader_path/../Frameworks",
1589+
);
1590+
PRODUCT_BUNDLE_IDENTIFIER = io.pivotal.RMQClientIntegrationTests;
1591+
PRODUCT_NAME = "$(TARGET_NAME)";
1592+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
1593+
SWIFT_OBJC_BRIDGING_HEADER = "RMQClientIntegrationTests/RMQClientIntegrationTests-Bridging-Header.h";
1594+
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
1595+
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
1596+
SWIFT_VERSION = 4.2;
1597+
};
1598+
name = "Test with TLS";
1599+
};
13201600
AEA45EE01C440FE400FE1F62 /* Debug */ = {
13211601
isa = XCBuildConfiguration;
13221602
buildSettings = {
@@ -1330,6 +1610,7 @@
13301610
);
13311611
PRODUCT_BUNDLE_IDENTIFIER = io.pivotal.RMQClientIntegrationTests;
13321612
PRODUCT_NAME = "$(TARGET_NAME)";
1613+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
13331614
SWIFT_OBJC_BRIDGING_HEADER = "RMQClientIntegrationTests/RMQClientIntegrationTests-Bridging-Header.h";
13341615
SWIFT_OPTIMIZATION_LEVEL = "-Onone";
13351616
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
@@ -1350,6 +1631,7 @@
13501631
);
13511632
PRODUCT_BUNDLE_IDENTIFIER = io.pivotal.RMQClientIntegrationTests;
13521633
PRODUCT_NAME = "$(TARGET_NAME)";
1634+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
13531635
SWIFT_OBJC_BRIDGING_HEADER = "RMQClientIntegrationTests/RMQClientIntegrationTests-Bridging-Header.h";
13541636
SWIFT_SWIFT3_OBJC_INFERENCE = Default;
13551637
SWIFT_VERSION = 4.2;
@@ -1419,7 +1701,9 @@
14191701
MACOSX_DEPLOYMENT_TARGET = 10.12;
14201702
MTL_ENABLE_DEBUG_INFO = YES;
14211703
ONLY_ACTIVE_ARCH = YES;
1704+
OTHER_SWIFT_FLAGS = "";
14221705
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
1706+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
14231707
SWIFT_VERSION = 4.2;
14241708
TARGETED_DEVICE_FAMILY = "1,2";
14251709
VALIDATE_PRODUCT = NO;
@@ -1480,7 +1764,9 @@
14801764
IPHONEOS_DEPLOYMENT_TARGET = 10.3;
14811765
MACOSX_DEPLOYMENT_TARGET = 10.12;
14821766
MTL_ENABLE_DEBUG_INFO = NO;
1767+
OTHER_SWIFT_FLAGS = "";
14831768
SUPPORTED_PLATFORMS = "iphonesimulator iphoneos macosx";
1769+
SWIFT_ACTIVE_COMPILATION_CONDITIONS = "";
14841770
SWIFT_COMPILATION_MODE = wholemodule;
14851771
SWIFT_OPTIMIZATION_LEVEL = "-O";
14861772
SWIFT_VERSION = 4.2;
@@ -1587,6 +1873,8 @@
15871873
isa = XCConfigurationList;
15881874
buildConfigurations = (
15891875
AEA45EE01C440FE400FE1F62 /* Debug */,
1876+
70338A2A21FBBB0D00C9069D /* Test without TLS */,
1877+
70338A2E21FBBB2000C9069D /* Test with TLS */,
15901878
AEA45EE11C440FE400FE1F62 /* Release */,
15911879
);
15921880
defaultConfigurationIsVisible = 0;
@@ -1596,6 +1884,8 @@
15961884
isa = XCConfigurationList;
15971885
buildConfigurations = (
15981886
AEE7FEA31C3BCA6000DF8C4F /* Debug */,
1887+
70338A2721FBBB0D00C9069D /* Test without TLS */,
1888+
70338A2B21FBBB2000C9069D /* Test with TLS */,
15991889
AEE7FEA41C3BCA6000DF8C4F /* Release */,
16001890
);
16011891
defaultConfigurationIsVisible = 0;
@@ -1605,6 +1895,8 @@
16051895
isa = XCConfigurationList;
16061896
buildConfigurations = (
16071897
AEE7FEA61C3BCA6000DF8C4F /* Debug */,
1898+
70338A2821FBBB0D00C9069D /* Test without TLS */,
1899+
70338A2C21FBBB2000C9069D /* Test with TLS */,
16081900
AEE7FEA71C3BCA6000DF8C4F /* Release */,
16091901
);
16101902
defaultConfigurationIsVisible = 0;
@@ -1614,6 +1906,8 @@
16141906
isa = XCConfigurationList;
16151907
buildConfigurations = (
16161908
AEE7FEA91C3BCA6000DF8C4F /* Debug */,
1909+
70338A2921FBBB0D00C9069D /* Test without TLS */,
1910+
70338A2D21FBBB2000C9069D /* Test with TLS */,
16171911
AEE7FEAA1C3BCA6000DF8C4F /* Release */,
16181912
);
16191913
defaultConfigurationIsVisible = 0;

0 commit comments

Comments
 (0)