From 742aefb25bad0848de8af4b60aa3bd179c32eb93 Mon Sep 17 00:00:00 2001
From: Shanqing Cai <cais@google.com>
Date: Fri, 29 Apr 2016 22:10:13 -0400
Subject: [PATCH] Blacklist py tests in python/platform/default

These tests are superseded by the corresponding ones in python/platform
in the OSS tests. They are currently used only internally and will be
eventually removed in the future.
---
 .../ci_build/builds/test_installation.sh      | 22 +++++++++++++++----
 1 file changed, 18 insertions(+), 4 deletions(-)

diff --git a/tensorflow/tools/ci_build/builds/test_installation.sh b/tensorflow/tools/ci_build/builds/test_installation.sh
index 56243cb2c7c..71ba6df634f 100755
--- a/tensorflow/tools/ci_build/builds/test_installation.sh
+++ b/tensorflow/tools/ci_build/builds/test_installation.sh
@@ -72,7 +72,10 @@
 #   depends on having the .so which is not shipped in the pip package.
 # tensorflow/contrib/quantization/*:
 #   These depend on an .so mechanism that's not shipped in the pip package.
-#
+# tensorflow/python/platform/default/*_test.py:
+#   These are obsolete and replaced by corresponding files in python/platform.
+#   They will be removed in the future.
+
 PY_TEST_BLACKLIST="${PY_TEST_BLACKLIST}:"\
 "tensorflow/python/framework/ops_test.py:"\
 "tensorflow/python/util/protobuf/compare_test.py:"\
@@ -81,7 +84,11 @@ PY_TEST_BLACKLIST="${PY_TEST_BLACKLIST}:"\
 "tensorflow/python/framework/file_system_test.py:"\
 "tensorflow/contrib/quantization/python/dequantize_op_test.py:"\
 "tensorflow/contrib/quantization/python/quantized_conv_ops_test.py:"\
-"tensorflow/contrib/quantization/tools/quantize_graph_test.py"
+"tensorflow/contrib/quantization/tools/quantize_graph_test.py:"\
+"tensorflow/python/platform/default/_resource_loader_test.py:"\
+"tensorflow/python/platform/default/flags_test.py:"\
+"tensorflow/python/platform/default/logging_test.py:"\
+"tensorflow/python/platform/default/gfile_test.py"
 
 # Test blacklist: GPU-only
 PY_TEST_GPU_BLACKLIST="${PY_TEST_GPU_BLACKLIST}:"\
@@ -287,6 +294,11 @@ while true; do
 
   ITER_COUNTER=0
   while true; do
+    # Break if the end is reached
+    if [[ $(echo "${TEST_COUNTER} >= ${PY_TEST_COUNT}" | bc -l) == "1" ]]; then
+      break;
+    fi
+
     # for TEST_FILE_PATH in ${ALL_PY_TESTS}; do
     TEST_FILE_PATH=${ALL_PY_TESTS[TEST_COUNTER]}
 
@@ -312,8 +324,8 @@ while true; do
     TEST_INDICES="${TEST_INDICES} ${TEST_COUNTER}"
     TEST_FILE_PATHS="${TEST_FILE_PATHS} ${TEST_FILE_PATH}"
 
-    # Copy to a separate directory to guard against the possibility of picking up
-    # modules in the source directory
+    # Copy to a separate directory to guard against the possibility of picking
+    # up modules in the source directory
     cp ${TEST_FILE_PATH} ${PY_TEST_DIR}/
 
     TEST_BASENAME=$(basename "${TEST_FILE_PATH}")
@@ -327,6 +339,7 @@ while true; do
     TEST_LOG=$(realpath ${TEST_LOG_REL})  # Absolute path
     TEST_LOGS="${TEST_LOGS} ${TEST_LOG}"
 
+    # Launch test asynchronously
     "${SCRIPT_DIR}/py_test_delegate.sh" \
       "${PYTHON_BIN_PATH}" "${PY_TEST_DIR}/${TEST_BASENAME}" "${TEST_LOG}" &
 
@@ -386,6 +399,7 @@ while true; do
     ((K++))
   done
 
+  # Stop if the end is reached
   if [[ $(echo "${TEST_COUNTER} >= ${PY_TEST_COUNT}" | bc -l) == "1" ]]; then
     break;
   fi