From 4fb924f939b75195d39d9495f10b34d3f364c165 Mon Sep 17 00:00:00 2001 From: "Denny C. Dai" Date: Thu, 23 Jun 2022 17:42:31 -0700 Subject: [PATCH] [gRPC/iOS] Remove and cleanup CoreTest iOS test (#30095) --- .../CoreTests.xcodeproj/project.pbxproj | 365 ------------------ .../CoreTests/EventEngineTimerTests.mm | 51 --- src/objective-c/tests/CoreTests/Podfile | 16 - .../tests/CoreTests/build_and_run_tests.sh | 32 -- .../tests/CoreTests/build_tests.sh | 54 --- tools/run_tests/run_tests.py | 9 - 6 files changed, 527 deletions(-) delete mode 100644 src/objective-c/tests/CoreTests/CoreTests.xcodeproj/project.pbxproj delete mode 100644 src/objective-c/tests/CoreTests/CoreTests/EventEngineTimerTests.mm delete mode 100644 src/objective-c/tests/CoreTests/Podfile delete mode 100755 src/objective-c/tests/CoreTests/build_and_run_tests.sh delete mode 100755 src/objective-c/tests/CoreTests/build_tests.sh diff --git a/src/objective-c/tests/CoreTests/CoreTests.xcodeproj/project.pbxproj b/src/objective-c/tests/CoreTests/CoreTests.xcodeproj/project.pbxproj deleted file mode 100644 index c6e8371335d..00000000000 --- a/src/objective-c/tests/CoreTests/CoreTests.xcodeproj/project.pbxproj +++ /dev/null @@ -1,365 +0,0 @@ -// !$*UTF8*$! -{ - archiveVersion = 1; - classes = { - }; - objectVersion = 46; - objects = { - -/* Begin PBXBuildFile section */ - 74EC3A952708149C005DF382 /* EventEngineTimerTests.mm in Sources */ = {isa = PBXBuildFile; fileRef = 74EC3A942708149C005DF382 /* EventEngineTimerTests.mm */; }; - AE7618A265DF8B92E93BDFFC /* libPods-CoreTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = CC79A999099057E7806F7A4E /* libPods-CoreTests.a */; }; -/* End PBXBuildFile section */ - -/* Begin PBXFileReference section */ - 74EC3A7527081130005DF382 /* CoreTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = CoreTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; - 74EC3A942708149C005DF382 /* EventEngineTimerTests.mm */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.objcpp; name = EventEngineTimerTests.mm; path = CoreTests/EventEngineTimerTests.mm; sourceTree = ""; }; - BC32E593C6B40EAC11EDD29E /* Pods-CoreTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CoreTests.release.xcconfig"; path = "Target Support Files/Pods-CoreTests/Pods-CoreTests.release.xcconfig"; sourceTree = ""; }; - CC2F5D65EA0FAB6B5347995A /* Pods-CoreTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-CoreTests.debug.xcconfig"; path = "Target Support Files/Pods-CoreTests/Pods-CoreTests.debug.xcconfig"; sourceTree = ""; }; - CC79A999099057E7806F7A4E /* libPods-CoreTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-CoreTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; -/* End PBXFileReference section */ - -/* Begin PBXFrameworksBuildPhase section */ - 74EC3A7227081130005DF382 /* Frameworks */ = { - isa = PBXFrameworksBuildPhase; - buildActionMask = 2147483647; - files = ( - AE7618A265DF8B92E93BDFFC /* libPods-CoreTests.a in Frameworks */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXFrameworksBuildPhase section */ - -/* Begin PBXGroup section */ - 3CD5ACD34F6BAA337C3076B2 /* Frameworks */ = { - isa = PBXGroup; - children = ( - CC79A999099057E7806F7A4E /* libPods-CoreTests.a */, - ); - name = Frameworks; - sourceTree = ""; - }; - 653269393ADB5A6623AFDD4C /* Pods */ = { - isa = PBXGroup; - children = ( - CC2F5D65EA0FAB6B5347995A /* Pods-CoreTests.debug.xcconfig */, - BC32E593C6B40EAC11EDD29E /* Pods-CoreTests.release.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; - 74EC3A512708112C005DF382 = { - isa = PBXGroup; - children = ( - 74EC3A942708149C005DF382 /* EventEngineTimerTests.mm */, - 74EC3A5B2708112C005DF382 /* Products */, - 653269393ADB5A6623AFDD4C /* Pods */, - 3CD5ACD34F6BAA337C3076B2 /* Frameworks */, - ); - sourceTree = ""; - }; - 74EC3A5B2708112C005DF382 /* Products */ = { - isa = PBXGroup; - children = ( - 74EC3A7527081130005DF382 /* CoreTests.xctest */, - ); - name = Products; - sourceTree = ""; - }; -/* End PBXGroup section */ - -/* Begin PBXNativeTarget section */ - 74EC3A7427081130005DF382 /* CoreTests */ = { - isa = PBXNativeTarget; - buildConfigurationList = 74EC3A8C27081130005DF382 /* Build configuration list for PBXNativeTarget "CoreTests" */; - buildPhases = ( - CCD5D09951B532EA7E1165AD /* [CP] Check Pods Manifest.lock */, - 74EC3A7127081130005DF382 /* Sources */, - 74EC3A7227081130005DF382 /* Frameworks */, - 74EC3A7327081130005DF382 /* Resources */, - ); - buildRules = ( - ); - dependencies = ( - ); - name = CoreTests; - productName = CoreTestsTests; - productReference = 74EC3A7527081130005DF382 /* CoreTests.xctest */; - productType = "com.apple.product-type.bundle.unit-test"; - }; -/* End PBXNativeTarget section */ - -/* Begin PBXProject section */ - 74EC3A522708112C005DF382 /* Project object */ = { - isa = PBXProject; - attributes = { - BuildIndependentTargetsInParallel = 1; - LastUpgradeCheck = 1300; - TargetAttributes = { - 74EC3A7427081130005DF382 = { - CreatedOnToolsVersion = 13.0; - }; - }; - }; - buildConfigurationList = 74EC3A552708112C005DF382 /* Build configuration list for PBXProject "CoreTests" */; - compatibilityVersion = "Xcode 13.0"; - developmentRegion = en; - hasScannedForEncodings = 0; - knownRegions = ( - en, - Base, - ); - mainGroup = 74EC3A512708112C005DF382; - productRefGroup = 74EC3A5B2708112C005DF382 /* Products */; - projectDirPath = ""; - projectRoot = ""; - targets = ( - 74EC3A7427081130005DF382 /* CoreTests */, - ); - }; -/* End PBXProject section */ - -/* Begin PBXResourcesBuildPhase section */ - 74EC3A7327081130005DF382 /* Resources */ = { - isa = PBXResourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXResourcesBuildPhase section */ - -/* Begin PBXShellScriptBuildPhase section */ - CCD5D09951B532EA7E1165AD /* [CP] Check Pods Manifest.lock */ = { - isa = PBXShellScriptBuildPhase; - buildActionMask = 2147483647; - files = ( - ); - inputFileListPaths = ( - ); - inputPaths = ( - "${PODS_PODFILE_DIR_PATH}/Podfile.lock", - "${PODS_ROOT}/Manifest.lock", - ); - name = "[CP] Check Pods Manifest.lock"; - outputFileListPaths = ( - ); - outputPaths = ( - "$(DERIVED_FILE_DIR)/Pods-CoreTests-checkManifestLockResult.txt", - ); - runOnlyForDeploymentPostprocessing = 0; - shellPath = /bin/sh; - shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n # print error to STDERR\n echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n"; - showEnvVarsInLog = 0; - }; -/* End PBXShellScriptBuildPhase section */ - -/* Begin PBXSourcesBuildPhase section */ - 74EC3A7127081130005DF382 /* Sources */ = { - isa = PBXSourcesBuildPhase; - buildActionMask = 2147483647; - files = ( - 74EC3A952708149C005DF382 /* EventEngineTimerTests.mm in Sources */, - ); - runOnlyForDeploymentPostprocessing = 0; - }; -/* End PBXSourcesBuildPhase section */ - -/* Begin XCBuildConfiguration section */ - 74EC3A8727081130005DF382 /* Debug */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = dwarf; - ENABLE_STRICT_OBJC_MSGSEND = YES; - ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_DYNAMIC_NO_PIC = NO; - GCC_NO_COMMON_BLOCKS = YES; - GCC_OPTIMIZATION_LEVEL = 0; - GCC_PREPROCESSOR_DEFINITIONS = ( - "DEBUG=1", - "$(inherited)", - ); - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - MTL_ENABLE_DEBUG_INFO = INCLUDE_SOURCE; - MTL_FAST_MATH = YES; - ONLY_ACTIVE_ARCH = YES; - SDKROOT = iphoneos; - USER_HEADER_SEARCH_PATHS = ""; - }; - name = Debug; - }; - 74EC3A8827081130005DF382 /* Release */ = { - isa = XCBuildConfiguration; - buildSettings = { - ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_ANALYZER_NONNULL = YES; - CLANG_ANALYZER_NUMBER_OBJECT_CONVERSION = YES_AGGRESSIVE; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++17"; - CLANG_CXX_LIBRARY = "libc++"; - CLANG_ENABLE_MODULES = YES; - CLANG_ENABLE_OBJC_ARC = YES; - CLANG_ENABLE_OBJC_WEAK = YES; - CLANG_WARN_BLOCK_CAPTURE_AUTORELEASING = YES; - CLANG_WARN_BOOL_CONVERSION = YES; - CLANG_WARN_COMMA = YES; - CLANG_WARN_CONSTANT_CONVERSION = YES; - CLANG_WARN_DEPRECATED_OBJC_IMPLEMENTATIONS = YES; - CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; - CLANG_WARN_DOCUMENTATION_COMMENTS = YES; - CLANG_WARN_EMPTY_BODY = YES; - CLANG_WARN_ENUM_CONVERSION = YES; - CLANG_WARN_INFINITE_RECURSION = YES; - CLANG_WARN_INT_CONVERSION = YES; - CLANG_WARN_NON_LITERAL_NULL_CONVERSION = YES; - CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES; - CLANG_WARN_OBJC_LITERAL_CONVERSION = YES; - CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; - CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES; - CLANG_WARN_RANGE_LOOP_ANALYSIS = YES; - CLANG_WARN_STRICT_PROTOTYPES = YES; - CLANG_WARN_SUSPICIOUS_MOVE = YES; - CLANG_WARN_UNGUARDED_AVAILABILITY = YES_AGGRESSIVE; - CLANG_WARN_UNREACHABLE_CODE = YES; - CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; - COPY_PHASE_STRIP = NO; - DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; - ENABLE_NS_ASSERTIONS = NO; - ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu11; - GCC_NO_COMMON_BLOCKS = YES; - GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; - GCC_WARN_UNDECLARED_SELECTOR = YES; - GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE; - GCC_WARN_UNUSED_FUNCTION = YES; - GCC_WARN_UNUSED_VARIABLE = YES; - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - MTL_ENABLE_DEBUG_INFO = NO; - MTL_FAST_MATH = YES; - SDKROOT = iphoneos; - USER_HEADER_SEARCH_PATHS = ""; - VALIDATE_PRODUCT = YES; - }; - name = Release; - }; - 74EC3A8D27081130005DF382 /* Debug */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = CC2F5D65EA0FAB6B5347995A /* Pods-CoreTests.debug.xcconfig */; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"${PODS_ROOT}/Headers/Public\"", - "\"${PODS_ROOT}/Headers/Public/BoringSSL-GRPC\"", - "\"${PODS_ROOT}/Headers/Public/Libuv-gRPC\"", - "\"${PODS_ROOT}/Headers/Public/abseil\"", - "\"${PODS_ROOT}/Headers/Public/gRPC-Core\"", - ); - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.google.CoreTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = NO; - TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "\"$(PODS_ROOT)/../../../../../\""; - }; - name = Debug; - }; - 74EC3A8E27081130005DF382 /* Release */ = { - isa = XCBuildConfiguration; - baseConfigurationReference = BC32E593C6B40EAC11EDD29E /* Pods-CoreTests.release.xcconfig */; - buildSettings = { - CODE_SIGN_STYLE = Automatic; - CURRENT_PROJECT_VERSION = 1; - GENERATE_INFOPLIST_FILE = YES; - HEADER_SEARCH_PATHS = ( - "$(inherited)", - "\"${PODS_ROOT}/Headers/Public\"", - "\"${PODS_ROOT}/Headers/Public/BoringSSL-GRPC\"", - "\"${PODS_ROOT}/Headers/Public/Libuv-gRPC\"", - "\"${PODS_ROOT}/Headers/Public/abseil\"", - "\"${PODS_ROOT}/Headers/Public/gRPC-Core\"", - ); - IPHONEOS_DEPLOYMENT_TARGET = 9.0; - LD_RUNPATH_SEARCH_PATHS = ( - "$(inherited)", - "@executable_path/Frameworks", - "@loader_path/Frameworks", - ); - MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.google.CoreTests; - PRODUCT_NAME = "$(TARGET_NAME)"; - SWIFT_EMIT_LOC_STRINGS = NO; - TARGETED_DEVICE_FAMILY = "1,2"; - USER_HEADER_SEARCH_PATHS = "\"$(PODS_ROOT)/../../../../../\""; - }; - name = Release; - }; -/* End XCBuildConfiguration section */ - -/* Begin XCConfigurationList section */ - 74EC3A552708112C005DF382 /* Build configuration list for PBXProject "CoreTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 74EC3A8727081130005DF382 /* Debug */, - 74EC3A8827081130005DF382 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; - 74EC3A8C27081130005DF382 /* Build configuration list for PBXNativeTarget "CoreTests" */ = { - isa = XCConfigurationList; - buildConfigurations = ( - 74EC3A8D27081130005DF382 /* Debug */, - 74EC3A8E27081130005DF382 /* Release */, - ); - defaultConfigurationIsVisible = 0; - defaultConfigurationName = Release; - }; -/* End XCConfigurationList section */ - }; - rootObject = 74EC3A522708112C005DF382 /* Project object */; -} diff --git a/src/objective-c/tests/CoreTests/CoreTests/EventEngineTimerTests.mm b/src/objective-c/tests/CoreTests/CoreTests/EventEngineTimerTests.mm deleted file mode 100644 index d78690c5861..00000000000 --- a/src/objective-c/tests/CoreTests/CoreTests/EventEngineTimerTests.mm +++ /dev/null @@ -1,51 +0,0 @@ -/* - * - * Copyright 2021 gRPC authors. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#import - -#include -#include - -#include -#include -#include - -@interface EventEngineTimerTests : XCTestCase - -@end - -@implementation EventEngineTimerTests - -+ (void)setUp { - grpc_init(); -} - -+ (void)tearDown { - grpc_shutdown(); -} - -- (void)setUp { -} - -- (void)tearDown { -} - -- (void)testDummy { -} - -@end diff --git a/src/objective-c/tests/CoreTests/Podfile b/src/objective-c/tests/CoreTests/Podfile deleted file mode 100644 index 3efbb24b945..00000000000 --- a/src/objective-c/tests/CoreTests/Podfile +++ /dev/null @@ -1,16 +0,0 @@ -source 'https://github.com/CocoaPods/Specs.git' - -install! 'cocoapods', :deterministic_uuids => false - -GRPC_LOCAL_SRC = '../../../..' - -def grpc_deps - pod 'BoringSSL-GRPC', :podspec => "#{GRPC_LOCAL_SRC}/src/objective-c" - pod 'gRPC-Core', :path => GRPC_LOCAL_SRC - pod 'gRPC-Core/Tests', :path => GRPC_LOCAL_SRC -end - -target 'CoreTests' do - platform :ios, '9.0' - grpc_deps -end diff --git a/src/objective-c/tests/CoreTests/build_and_run_tests.sh b/src/objective-c/tests/CoreTests/build_and_run_tests.sh deleted file mode 100755 index c75670c1a3c..00000000000 --- a/src/objective-c/tests/CoreTests/build_and_run_tests.sh +++ /dev/null @@ -1,32 +0,0 @@ -#!/bin/bash -# Copyright 2019 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Don't run this script standalone. Instead, run from the repository root: -# ./tools/run_tests/run_tests.py -l c++ - -set -ex -set -o pipefail # preserve xcodebuild exit code when piping output - -cd "$(dirname "$0")" - -time ./build_tests.sh - -XCODEBUILD_FILTER_OUTPUT_SCRIPT="../xcodebuild_filter_output.sh" - -xcodebuild \ - -workspace CoreTests.xcworkspace \ - -scheme CoreTests \ - -destination name="iPhone 8" \ - test | "${XCODEBUILD_FILTER_OUTPUT_SCRIPT}" diff --git a/src/objective-c/tests/CoreTests/build_tests.sh b/src/objective-c/tests/CoreTests/build_tests.sh deleted file mode 100755 index 40917d017f9..00000000000 --- a/src/objective-c/tests/CoreTests/build_tests.sh +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/bash -# Copyright 2019 gRPC authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Don't run this script standalone. Instead, run from the repository root: -# ./tools/run_tests/run_tests.py -l objc - -set -ex - -# CocoaPods requires the terminal to be using UTF-8 encoding. -export LANG=en_US.UTF-8 - -cd "$(dirname "$0")" - -# Check that required tools are available. -hash pod 2>/dev/null || { echo >&2 "Cocoapods needs to be installed."; exit 1; } -hash xcodebuild 2>/dev/null || { - echo >&2 "XCode command-line tools need to be installed." - exit 1 -} - -# TODO(jtattermusch): make the cleanup command consistent in all build_tests.sh directories. -# clean the directory -rm -rf Pods -# TODO(jtattermusch): is this wrong directory? -rm -rf Tests.xcworkspace -rm -f Podfile.lock -# TODO(jtattermusch): is this wrong directory? -rm -rf RemoteTestClientCpp/src - -time pod install - -# ios-cpp-test-cronet flakes sometimes because of missing files in Protobuf-C++, -# add some log to help find out the root cause. -# TODO(yulinliang): Delete it after solving the issue. -if [ -d "./Pods/Headers/Public/Protobuf-C++/google/protobuf" ] -then - echo "Protobuf-C++/google/protobuf/ has been imported." - number_of_files=$(find Pods/Headers/Public/Protobuf-C++/google/protobuf -name "*.h" | wc -l) - echo "The number of header files in Pods/Headers/Public/Protobuf-C++/google/protobuf/ is $number_of_files" -else - echo "Error: Protobuf-C++/google/protobuf/ hasn't been imported." -fi diff --git a/tools/run_tests/run_tests.py b/tools/run_tests/run_tests.py index 9805391d8ce..9ef14fe57e1 100755 --- a/tools/run_tests/run_tests.py +++ b/tools/run_tests/run_tests.py @@ -1022,15 +1022,6 @@ class ObjCLanguage(object): cpu_cost=1e6, environ=_FORCE_ENVIRON_FOR_WRAPPERS)) # TODO(jtattermusch): Create bazel target for the test and remove the test from here - # TODO(jtattermusch): Clarify what do these tests do? - out.append( - self.config.job_spec( - ['src/objective-c/tests/CoreTests/build_and_run_tests.sh'], - timeout_seconds=60 * 60, - shortname='ios-test-core-tests', - cpu_cost=1e6, - environ=_FORCE_ENVIRON_FOR_WRAPPERS)) - # TODO(jtattermusch): Create bazel target for the test and remove the test from here # (how does one add the cronet dependency in bazel?) out.append( self.config.job_spec(['src/objective-c/tests/run_one_test.sh'],