diff options
| author | Kevin Krakauer <krakauer@google.com> | 2020-06-09 10:45:31 -0700 |
|---|---|---|
| committer | gVisor bot <gvisor-bot@google.com> | 2020-06-09 10:48:24 -0700 |
| commit | 20afd66e019bf0aaaf66e854135cd2c0fe0dfd92 (patch) | |
| tree | 45a756bcb7e2dfd21c351c81dd084e4f9b5e2db7 | |
| parent | 4e96b94915633cc06bf04bd680f4eeba6a764dc9 (diff) | |
Invoke bazel query via bash function.
PiperOrigin-RevId: 315514034
| -rwxr-xr-x | scripts/common_build.sh | 4 | ||||
| -rwxr-xr-x | scripts/packetdrill_tests.sh | 3 | ||||
| -rwxr-xr-x | scripts/packetimpact_tests.sh | 3 |
3 files changed, 8 insertions, 2 deletions
diff --git a/scripts/common_build.sh b/scripts/common_build.sh index 4fe1067d2..0d9a191b5 100755 --- a/scripts/common_build.sh +++ b/scripts/common_build.sh @@ -63,6 +63,10 @@ function run_as_root() { bazel run --run_under="sudo" "${binary}" -- "$@" } +function query() { + QUERY_RESULT=$(bazel query "$@") +} + function collect_logs() { # Zip out everything into a convenient form. if [[ -v KOKORO_ARTIFACTS_DIR ]] && [[ -e bazel-testlogs ]]; then diff --git a/scripts/packetdrill_tests.sh b/scripts/packetdrill_tests.sh index f0fc444c8..727503bce 100755 --- a/scripts/packetdrill_tests.sh +++ b/scripts/packetdrill_tests.sh @@ -19,4 +19,5 @@ source $(dirname $0)/common.sh make load-packetdrill install_runsc_for_test runsc-d -test_runsc $(bazel query "attr(tags, manual, tests(//test/packetdrill/...))") +query "attr(tags, manual, tests(//test/packetdrill/...))" +test_runsc $QUERY_RESULT diff --git a/scripts/packetimpact_tests.sh b/scripts/packetimpact_tests.sh index 17fc43f27..51c11f23f 100755 --- a/scripts/packetimpact_tests.sh +++ b/scripts/packetimpact_tests.sh @@ -19,4 +19,5 @@ source $(dirname $0)/common.sh make load-packetimpact install_runsc_for_test runsc-d -test_runsc $(bazel query "attr(tags, packetimpact, tests(//test/packetimpact/...))") +query "attr(tags, packetimpact, tests(//test/packetimpact/...))" +test_runsc $QUERY_RESULT |