Skip to content

Commit fab303b

Browse files
committed
Avoid interop build instructions when already built
This reduces the amount of logspam generated during interop testing. Telling someone how to build when they have already obviously built doesn't serve much purpose, now that everyone is used to it not building automatically.
1 parent 5362017 commit fab303b

File tree

2 files changed

+16
-12
lines changed

2 files changed

+16
-12
lines changed

run-test-client.sh

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#!/bin/bash -e
22
cd "$(dirname "$0")"
3-
cat >&2 <<EOF
4-
Gradle is no longer run automatically. Make sure to run
5-
'./gradlew installDist -PskipCodegen=true' or
6-
'./gradlew :grpc-interop-testing:installDist -PskipCodegen=true' after any
7-
changes. -PskipCodegen=true is optional, but requires less setup.
3+
BIN="./interop-testing/build/install/grpc-interop-testing/bin/test-client"
4+
if [[ ! -e "$BIN" ]]; then
5+
cat >&2 <<EOF
6+
Could not find binary. It can be built with:
7+
./gradlew :grpc-interop-testing:installDist -PskipCodegen=true
88
EOF
9-
exec ./interop-testing/build/install/grpc-interop-testing/bin/test-client "$@"
9+
exit 1
10+
fi
11+
exec "$BIN" "$@"

run-test-server.sh

+8-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
#!/bin/bash -e
22
cd "$(dirname "$0")"
3-
cat >&2 <<EOF
4-
Gradle is no longer run automatically. Make sure to run
5-
'./gradlew installDist -PskipCodegen=true' or
6-
'./gradlew :grpc-interop-testing:installDist -PskipCodegen=true' after any
7-
changes. -PskipCodegen=true is optional, but requires less setup.
3+
BIN="./interop-testing/build/install/grpc-interop-testing/bin/test-server"
4+
if [[ ! -e "$BIN" ]]; then
5+
cat >&2 <<EOF
6+
Could not find binary. It can be built with:
7+
./gradlew :grpc-interop-testing:installDist -PskipCodegen=true
88
EOF
9-
exec ./interop-testing/build/install/grpc-interop-testing/bin/test-server "$@"
9+
exit 1
10+
fi
11+
exec "$BIN" "$@"

0 commit comments

Comments
 (0)