Skip to content

Commit

Permalink
xds interop: Fix buildscripts not continuing on a failed test suite (#…
Browse files Browse the repository at this point in the history
…9833) (#9834)

Apparently there's a difference between bash 3 and bash 4.
OSX comes with bash 3 out-of-box, so for whoever wrote this logic
it "worked on my machine".

The `((` construct returns a 0 exit code if the value is non-zero.
Since the value starts at 0 and we do a post-increment,
it will always fail the first time.
Changing it to a pre-increment fixes the problem.
  • Loading branch information
sergiitk authored Jan 18, 2023
1 parent 5f4583d commit 13c6313
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion buildscripts/kokoro/psm-security.sh
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@ main() {
local failed_tests=0
test_suites=("baseline_test" "security_test" "authz_test")
for test in "${test_suites[@]}"; do
run_test $test || (( failed_tests++ ))
run_test $test || (( ++failed_tests ))
done
echo "Failed test suites: ${failed_tests}"
if (( failed_tests > 0 )); then
Expand Down
2 changes: 1 addition & 1 deletion buildscripts/kokoro/xds_k8s_lb.sh
Original file line number Diff line number Diff line change
Expand Up @@ -178,7 +178,7 @@ main() {
local failed_tests=0
test_suites=("api_listener_test" "change_backend_service_test" "failover_test" "remove_neg_test" "round_robin_test" "affinity_test" "outlier_detection_test" "custom_lb_test")
for test in "${test_suites[@]}"; do
run_test $test || (( failed_tests++ ))
run_test $test || (( ++failed_tests ))
done
echo "Failed test suites: ${failed_tests}"
if (( failed_tests > 0 )); then
Expand Down

0 comments on commit 13c6313

Please sign in to comment.