From 113cc4dbfc0c598d139bcf4118cde698c2e74589 Mon Sep 17 00:00:00 2001 From: Yifei Feng Date: Mon, 30 Apr 2018 11:26:52 -0700 Subject: [PATCH] Add --keep_going flag to bazel query in pip_smoke_test to bypass bazel query cannot handle select statement. PiperOrigin-RevId: 194816816 --- tensorflow/tools/pip_package/pip_smoke_test.py | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/tensorflow/tools/pip_package/pip_smoke_test.py b/tensorflow/tools/pip_package/pip_smoke_test.py index e2518f6..1b69210 100644 --- a/tensorflow/tools/pip_package/pip_smoke_test.py +++ b/tensorflow/tools/pip_package/pip_smoke_test.py @@ -79,6 +79,16 @@ BLACKLIST = [ ] +def bazel_query(query_target): + """Run bazel query on target.""" + try: + output = subprocess.check_output( + ["bazel", "query", "--keep_going", query_target]) + except subprocess.CalledProcessError as e: + output = e.output + return output + + def main(): """This script runs the pip smoke test. @@ -93,15 +103,13 @@ def main(): """ # pip_package_dependencies_list is the list of included files in pip packages - pip_package_dependencies = subprocess.check_output( - ["bazel", "query", PIP_PACKAGE_QUERY_EXPRESSION]) + pip_package_dependencies = bazel_query(PIP_PACKAGE_QUERY_EXPRESSION) pip_package_dependencies_list = pip_package_dependencies.strip().split("\n") print("Pip package superset size: %d" % len(pip_package_dependencies_list)) # tf_py_test_dependencies is the list of dependencies for all python # tests in tensorflow - tf_py_test_dependencies = subprocess.check_output( - ["bazel", "query", PY_TEST_QUERY_EXPRESSION]) + tf_py_test_dependencies = bazel_query(PY_TEST_QUERY_EXPRESSION) tf_py_test_dependencies_list = tf_py_test_dependencies.strip().split("\n") print("Pytest dependency subset size: %d" % len(tf_py_test_dependencies_list)) @@ -135,7 +143,7 @@ def main(): print("Affected Tests:") rdep_query = ("rdeps(kind(py_test, //tensorflow/python/...), %s)" % missing_dependency) - affected_tests = subprocess.check_output(["bazel", "query", rdep_query]) + affected_tests = bazel_query(rdep_query) affected_tests_list = affected_tests.split("\n")[:-2] print("\n".join(affected_tests_list)) -- 2.7.4