Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3552)

Unified Diff: build_tools/common.sh

Issue 1578573002: Disable running of sel_ldr arm tests on mac (Closed) Base URL: https://chromium.googlesource.com/webports.git@master
Patch Set: Created 4 years, 11 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | ports/fftw-float/build.sh » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build_tools/common.sh
diff --git a/build_tools/common.sh b/build_tools/common.sh
index 007ea92f27562b5002b3742e99c1a68feaa58634..c18db33bf277e5396ae3c14d2f7f705ebec9993a 100644
--- a/build_tools/common.sh
+++ b/build_tools/common.sh
@@ -263,10 +263,16 @@ DESTDIR_INCLUDE=${DESTDIR}/${PREFIX}/include
PUBLISH_DIR="${NACL_PACKAGES_PUBLISH}/${PACKAGE_NAME}/${TOOLCHAIN}"
PUBLISH_CREATE_NMF_ARGS="-L ${DESTDIR_LIB}"
+if [[ ${OS_NAME} == Linux ]]; then
+ SEL_LDR_SUPPORTS_ARM=1
+else
+ SEL_LDR_SUPPORTS_ARM=0
+fi
+
SKIP_SEL_LDR_TESTS=0
# Skip sel_ldr tests on ARM, except on linux where we have qemu-arm available.
-if [ "${NACL_ARCH}" = "arm" -a "${OS_NAME}" != "Linux" ]; then
+if [[ ${NACL_ARCH} == arm && ${SEL_LDR_SUPPORTS_ARM} == 0 ]]; then
SKIP_SEL_LDR_TESTS=1
fi
« no previous file with comments | « no previous file | ports/fftw-float/build.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698