From 37cb19fb9e1b83cec61c5a728d0df7796ee2bb3a Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Thu, 30 Jan 2020 09:55:41 -0800 Subject: [PATCH 1/2] Add timestamp to build tests --- src/objective-c/tests/build_one_example.sh | 6 +++++- src/objective-c/tests/verbose_time.sh | 20 ++++++++++++++++++++ 2 files changed, 25 insertions(+), 1 deletion(-) create mode 100755 src/objective-c/tests/verbose_time.sh diff --git a/src/objective-c/tests/build_one_example.sh b/src/objective-c/tests/build_one_example.sh index caa048e258b..43ffb0e7d62 100755 --- a/src/objective-c/tests/build_one_example.sh +++ b/src/objective-c/tests/build_one_example.sh @@ -25,6 +25,8 @@ set -ev # CocoaPods requires the terminal to be using UTF-8 encoding. export LANG=en_US.UTF-8 +TEST_PATH=$(cd "$(dirname $0)" > /dev/null ; pwd) + cd `dirname $0`/../../.. cd $EXAMPLE_PATH @@ -34,7 +36,7 @@ rm -rf Pods rm -rf *.xcworkspace rm -f Podfile.lock -pod install +pod install | $TEST_PATH/verbose_time.sh set -o pipefail XCODEBUILD_FILTER='(^CompileC |^Ld |^.*clang |^ *cd |^ *export |^Libtool |^.*libtool |^CpHeader |^ *builtin-copy )' @@ -47,6 +49,7 @@ if [ "$SCHEME" == "tvOS-sample" ]; then -derivedDataPath Build/Build \ CODE_SIGN_IDENTITY="" \ CODE_SIGNING_REQUIRED=NO \ + | $TEST_PATH/verbose_time.sh \ | egrep -v "$XCODEBUILD_FILTER" \ | egrep -v "^$" - else @@ -58,6 +61,7 @@ else -derivedDataPath Build/Build \ CODE_SIGN_IDENTITY="" \ CODE_SIGNING_REQUIRED=NO \ + | $TEST_PATH/verbose_time.sh \ | egrep -v "$XCODEBUILD_FILTER" \ | egrep -v "^$" - fi diff --git a/src/objective-c/tests/verbose_time.sh b/src/objective-c/tests/verbose_time.sh new file mode 100755 index 00000000000..05926caea85 --- /dev/null +++ b/src/objective-c/tests/verbose_time.sh @@ -0,0 +1,20 @@ +#!/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. + +#!/bin/bash + +while IFS= read -r line; do + echo "$(date) - $line" +done From f61a85eefa2e0ef92c0b87cf14545333b98d94ba Mon Sep 17 00:00:00 2001 From: Muxi Yan Date: Thu, 30 Jan 2020 09:58:20 -0800 Subject: [PATCH 2/2] Add timestamp to basic tests --- src/objective-c/tests/build_tests.sh | 2 +- src/objective-c/tests/run_one_test.sh | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/objective-c/tests/build_tests.sh b/src/objective-c/tests/build_tests.sh index 340044f3222..6dbca6a58ef 100755 --- a/src/objective-c/tests/build_tests.sh +++ b/src/objective-c/tests/build_tests.sh @@ -36,5 +36,5 @@ rm -f Podfile.lock rm -f RemoteTestClient/*.{h,m} echo "TIME: $(date)" -pod install +pod install | ./verbose_time.sh diff --git a/src/objective-c/tests/run_one_test.sh b/src/objective-c/tests/run_one_test.sh index 53914f67516..6dff1ff5887 100755 --- a/src/objective-c/tests/run_one_test.sh +++ b/src/objective-c/tests/run_one_test.sh @@ -86,6 +86,7 @@ xcodebuild \ HOST_PORT_LOCAL=localhost:$PLAIN_PORT \ HOST_PORT_REMOTE=grpc-test.sandbox.googleapis.com \ test \ + | ./verbose_time.sh \ | egrep -v "$XCODEBUILD_FILTER" \ | egrep -v '^$' \ | egrep -v "(GPBDictionary|GPBArray)" -