Internal change.

PiperOrigin-RevId: 227920137
This commit is contained in:
Andrew Selle 2019-01-04 15:03:28 -08:00 committed by TensorFlower Gardener
parent 1dee496b6a
commit 58edbcb97b
4 changed files with 10 additions and 4 deletions

View File

@ -88,7 +88,8 @@ if [[ ${IS_GPU} == "1" ]]; then
PIP_TEST_FILTER_TAG="-no_gpu,-no_pip_gpu,${PIP_TEST_FILTER_TAG}"
fi
if [[ ${IS_MAC} == "1" ]]; then
PIP_TEST_FILTER_TAG="-nomac,${PIP_TEST_FILTER_TAG}"
# TODO(b/122370901): Fix nomac, no_mac inconsistency.
PIP_TEST_FILTER_TAG="-nomac,-no_mac,${PIP_TEST_FILTER_TAG}"
fi
# Bazel flags we need for all tests:

View File

@ -398,7 +398,8 @@ if [[ "${TF_BUILD_APPEND_ARGUMENTS}" == *"--test_tag_filters="* ]]; then
NEW_ITEM="${NEW_ITEM},-benchmark-test"
fi
if [[ ${IS_MAC} == "1" ]] && [[ ${NEW_ITEM} != *"nomac"* ]]; then
NEW_ITEM="${NEW_ITEM},-nomac"
# TODO(b/122370901): Fix nomac, no_mac inconsistency.
NEW_ITEM="${NEW_ITEM},-nomac,-no_mac"
fi
EXTRA_ARGS="${EXTRA_ARGS} ${NEW_ITEM}"
else
@ -408,11 +409,13 @@ if [[ "${TF_BUILD_APPEND_ARGUMENTS}" == *"--test_tag_filters="* ]]; then
else
EXTRA_ARGS="${EXTRA_ARGS} ${TF_BUILD_APPEND_ARGUMENTS} --test_tag_filters=-no_oss,-oss_serial,-benchmark-test"
if [[ ${IS_MAC} == "1" ]]; then
EXTRA_ARGS="${EXTRA_ARGS},-nomac"
# TODO(b/122370901): Fix nomac, no_mac inconsistency.
EXTRA_ARGS="${EXTRA_ARGS},-nomac,-no_mac"
fi
EXTRA_ARGS="${EXTRA_ARGS} --build_tag_filters=-no_oss,-oss_serial,-benchmark-test"
if [[ ${IS_MAC} == "1" ]]; then
EXTRA_ARGS="${EXTRA_ARGS},-nomac"
# TODO(b/122370901): Fix nomac, no_mac inconsistency.
EXTRA_ARGS="${EXTRA_ARGS},-nomac,-no_mac"
fi
fi

View File

@ -31,6 +31,7 @@ export CC_OPT_FLAGS='-mavx'
export PYTHON_BIN_PATH=$(which python2)
yes "" | $PYTHON_BIN_PATH configure.py
which bazel
# TODO(b/122370901): Fix nomac, no_mac inconsistency.
bazel test --test_tag_filters=-no_oss,-gpu,-benchmark-test,-nomac,-no_mac \
--test_timeout 300,450,1200,3600 \
--test_size_filters=small,medium --config=opt \

View File

@ -32,6 +32,7 @@ export CC_OPT_FLAGS='-mavx'
export PYTHON_BIN_PATH=$(which python2)
yes "" | $PYTHON_BIN_PATH configure.py
which bazel
# TODO(b/122370901): Fix nomac, no_mac inconsistency.
bazel test --test_tag_filters=-no_oss,-gpu,-benchmark-test,-nomac,-no_mac \
--test_timeout 300,450,1200,3600 --config=opt \
--announce_rc \