go
/
gvisor
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Minor runtime test fixes. 

* Allow scripts/common.sh to be sourced from outside the scripts/ directory
* Fix passing empty args to Bazel, which causes the tool to exit with a failure
  even if the command succeeds.

PiperOrigin-RevId: 294785456
This commit is contained in:
gVisor bot 2020-02-12 16:26:08 -08:00
parent 46a36b64d5
commit cf1e50a809
3 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
kokoro/runtime_tests/runtime_tests.sh
View File

@ -14,7 +14,11 @@
# See the License for the specific language governing permissions and
# limitations under the License.
source $(dirname $0)/common.sh
# Run in the root of the repo.
cd "$(dirname "$0")"
cd "$(git rev-parse --show-toplevel)"
source scripts/common.sh
if [ ! -v RUNTIME_TEST_NAME ]; then
echo 'Must set $RUNTIME_TEST_NAME' >&2

12
scripts/common.sh
View File

@ -16,7 +16,17 @@
set -xeou pipefail
source $(dirname $0)/common_build.sh
# Get the path to the directory this script lives in.
# If this script is being called with `source`, $0 will be the path of the
# *sourcing* script, so we can't use `dirname $0` to find scripts in this
# directory.
if [[ -v BASH_SOURCE && "$0" != "$BASH_SOURCE" ]]; then
declare -r script_dir="$(dirname "$BASH_SOURCE")"
else
declare -r script_dir="$(dirname "$0")"
fi
source "${script_dir}/common_build.sh"
# Ensure it attempts to collect logs in all cases.
trap collect_logs EXIT

27
scripts/common_build.sh
View File

@ -14,8 +14,7 @@
# See the License for the specific language governing permissions and
# limitations under the License.
# Install the latest version of Bazel and log the version.
(which use_bazel.sh && use_bazel.sh latest) || which bazel
which bazel
bazel version
# Switch into the workspace; only necessary if run with kokoro.
@ -26,27 +25,30 @@ elif [[ -v KOKORO_GIT_COMMIT ]] && [[ -d github/repo ]]; then
fi
# Set the standard bazel flags.
declare -r BAZEL_FLAGS=(
declare -a BAZEL_FLAGS=(
"--show_timestamps"
"--test_output=errors"
"--keep_going"
"--verbose_failures=true"
)
BAZEL_RBE_AUTH_FLAGS=""
BAZEL_RBE_FLAGS=""
if [[ -v KOKORO_BAZEL_AUTH_CREDENTIAL ]]; then
declare -r BAZEL_RBE_AUTH_FLAGS="--auth_credentials=${KOKORO_BAZEL_AUTH_CREDENTIAL}"
declare -r BAZEL_RBE_FLAGS="--config=remote"
BAZEL_FLAGS+=(
"--auth_credentials=${KOKORO_BAZEL_AUTH_CREDENTIAL}"
"--config=remote"
)
fi
declare -r BAZEL_FLAGS
# Wrap bazel.
function build() {
bazel build "${BAZEL_RBE_FLAGS}" "${BAZEL_RBE_AUTH_FLAGS}" "${BAZEL_FLAGS[@]}" "$@" 2>&1 |
tee /dev/fd/2 | grep -E '^ bazel-bin/' | awk '{ print $1; }'
bazel build "${BAZEL_FLAGS[@]}" "$@" 2>&1 \
| tee /dev/fd/2 \
| grep -E '^ bazel-bin/' \
| awk '{ print $1; }'
}
function test() {
bazel test "${BAZEL_RBE_FLAGS}" "${BAZEL_RBE_AUTH_FLAGS}" "${BAZEL_FLAGS[@]}" "$@"
bazel test "${BAZEL_FLAGS[@]}" "$@"
}
function run() {
@ -95,5 +97,8 @@ function collect_logs() {
}
function find_branch_name() {
git branch --show-current || git rev-parse HEAD || bazel info workspace | xargs basename
git branch --show-current \
|| git rev-parse HEAD \
|| bazel info workspace \
| xargs basename
}