diff options
author | Jorge Canizales <jcanizales@google.com> | 2016-07-15 23:16:32 -0700 |
---|---|---|
committer | Jorge Canizales <jcanizales@google.com> | 2016-07-15 23:16:32 -0700 |
commit | 545bad349cb7979a66e265b0ab8eda498c84f94e (patch) | |
tree | e354455161be35304a5d2ebdcb9430a8318f83b2 /src | |
parent | f4df3d2d02701c614c7b7155d3553eb2b3675953 (diff) |
Misc test scripts cleanup:
- Echo commands
- Remove generated code before pod install
- Don’t “clean” before “build”
Diffstat (limited to 'src')
-rwxr-xr-x | src/objective-c/tests/build_example_test.sh | 4 | ||||
-rwxr-xr-x | src/objective-c/tests/build_one_example.sh | 4 | ||||
-rwxr-xr-x | src/objective-c/tests/build_tests.sh | 5 | ||||
-rwxr-xr-x | src/objective-c/tests/run_tests.sh | 2 |
4 files changed, 11 insertions, 4 deletions
diff --git a/src/objective-c/tests/build_example_test.sh b/src/objective-c/tests/build_example_test.sh index ea262c61f4..756475c932 100755 --- a/src/objective-c/tests/build_example_test.sh +++ b/src/objective-c/tests/build_example_test.sh @@ -31,7 +31,7 @@ # Don't run this script standalone. Instead, run from the repository root: # ./tools/run_tests/run_tests.py -l objc -set -eo pipefail +set -evo pipefail cd `dirname $0` @@ -47,6 +47,8 @@ SCHEME=AuthSample \ EXAMPLE_PATH=examples/objective-c/auth_sample \ ./build_one_example.sh +rm -f ../examples/RemoteTestClient/*.{h,m} + SCHEME=Sample \ EXAMPLE_PATH=src/objective-c/examples/Sample \ ./build_one_example.sh diff --git a/src/objective-c/tests/build_one_example.sh b/src/objective-c/tests/build_one_example.sh index 24fb8b7bab..9fef6582a3 100755 --- a/src/objective-c/tests/build_one_example.sh +++ b/src/objective-c/tests/build_one_example.sh @@ -31,7 +31,7 @@ # Don't run this script standalone. Instead, run from the repository root: # ./tools/run_tests/run_tests.py -l objc -set -e +set -ev # Params: # EXAMPLE_PATH - directory of the example @@ -54,7 +54,7 @@ pod install set -o pipefail XCODEBUILD_FILTER='(^===|^\*\*|\bfatal\b|\berror\b|\bwarning\b|\bfail)' xcodebuild \ - clean build \ + build \ -workspace *.xcworkspace \ -scheme $SCHEME \ -destination name="iPhone 6" \ diff --git a/src/objective-c/tests/build_tests.sh b/src/objective-c/tests/build_tests.sh index 0afa819db2..bc5bc04494 100755 --- a/src/objective-c/tests/build_tests.sh +++ b/src/objective-c/tests/build_tests.sh @@ -44,5 +44,10 @@ hash xcodebuild 2>/dev/null || { exit 1 } +# clean the directory +rm -rf Pods +rm -rf Tests.xcworkspace +rm -f Podfile.lock +rm -f RemoteTestClient/*.{h,m} pod install diff --git a/src/objective-c/tests/run_tests.sh b/src/objective-c/tests/run_tests.sh index 9ad2aa1ca7..a265149f48 100755 --- a/src/objective-c/tests/run_tests.sh +++ b/src/objective-c/tests/run_tests.sh @@ -31,7 +31,7 @@ # Don't run this script standalone. Instead, run from the repository root: # ./tools/run_tests/run_tests.py -l objc -set -e +set -ev cd $(dirname $0) |