Another bugfix in run_and_gather_logs.

Change: 117375431

tensorflow/contrib/lookup/BUILD

@@ -22,8 +22,7 @@ py_test(
     srcs_version = "PY2AND3",
     deps = [
         ":lookup_py",
-        "//third_party/py/numpy",
-        "//third_party/py/tensorflow",
+        "//tensorflow:tensorflow_py",
         "//tensorflow/python:framework_test_lib",
         "//tensorflow/python:platform_test",
     ],

tensorflow/core/util/test_log.proto

@@ -51,7 +51,8 @@ message BenchmarkEntries {
 
 message BuildConfiguration {
   string mode = 1;               // opt, dbg, etc
-  repeated string cc_flags = 2;  // CC compiler flags
+  repeated string cc_flags = 2;  // CC compiler flags, if known
+  repeated string opts = 3;      // Bazel compilation options, if known
 };
 
 message CommitId {

tensorflow/tools/test/run_and_gather_logs.py

@@ -35,7 +35,7 @@ try:
   import psutil
 except ImportError as e:
   tf.logging.error("\n\n\nERROR: Unable to import necessary library: {}.  "
-                   "Issuing a soft exit.\n\n\n".format(e.message))
+                   "Issuing a soft exit.\n\n\n".format(e))
   sys.exit(0)
 # pylint: enable=g-bad-import-order
 # pylint: enable=unused-import