diff options
author | 2018-06-28 09:29:34 -0700 | |
---|---|---|
committer | 2018-06-28 09:30:38 -0700 | |
commit | 178e6cc5dd31a8b9748f9263eea6bcba5f2c7f31 (patch) | |
tree | f67018bb73a84a2900146e881fa93ac66490dab1 /src/test | |
parent | 3fc2880f9662f35a5e47b1e76eb383c8321d09ed (diff) |
Fix up some tests for Arm64
This is the first PR for my Arm64 test cleanup.
Closes #5457.
PiperOrigin-RevId: 202492291
Diffstat (limited to 'src/test')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL | 4 | ||||
-rwxr-xr-x | src/test/shell/testenv.sh | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL b/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL index dc49dcb0de..c423ae2e10 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL +++ b/src/test/java/com/google/devtools/build/lib/analysis/mock/MOCK_CROSSTOOL @@ -32,6 +32,10 @@ default_toolchain { cpu: "ppc" toolchain_identifier: "local_linux" } +default_toolchain { + cpu: "aarch64" + toolchain_identifier: "local_linux" +} toolchain { abi_version: "local" diff --git a/src/test/shell/testenv.sh b/src/test/shell/testenv.sh index 1f31aac38f..c490172a3d 100755 --- a/src/test/shell/testenv.sh +++ b/src/test/shell/testenv.sh @@ -105,7 +105,7 @@ python_server="${BAZEL_RUNFILES}/src/test/shell/bazel/testing_server.py" # Third-party MACHINE_TYPE="$(uname -m)" MACHINE_IS_64BIT='no' -if [ "${MACHINE_TYPE}" = 'amd64' ] || [ "${MACHINE_TYPE}" = 'x86_64' ] || [ "${MACHINE_TYPE}" = 's390x' ]; then +if [ "${MACHINE_TYPE}" = 'amd64' ] || [ "${MACHINE_TYPE}" = 'x86_64' ] || [ "${MACHINE_TYPE}" = 's390x' ] || [ "${MACHINE_TYPE}" = 'aarch64' ]; then MACHINE_IS_64BIT='yes' fi |