Make test srcdirs compatible with bazel > 0.2.2 where runfiles are

in a subdirectory under the workspace.
Change: 125590691

tensorflow/contrib/learn/python/learn/tests/runner_flags_test.sh

@@ -24,7 +24,20 @@ die() {
   exit 1
 }
 
-LEARN_DIR="${TEST_SRCDIR}/tensorflow/contrib/learn"
+DIR="$TEST_SRCDIR"
+
+# Check if TEST_WORKSPACE is defined, and set as empty string if not.
+if [ -z "${TEST_WORKSPACE-}" ]
+then
+  TEST_WORKSPACE=""
+fi
+
+if [ -z "$TEST_WORKSPACE" ]
+then
+  DIR="$DIR"/"$TEST_WORKSPACE"
+fi
+
+LEARN_DIR="${DIR}/tensorflow/contrib/learn"
 RUNNER_BIN="${LEARN_DIR}/runner_flags_test_util"
 
 ${RUNNER_BIN} --output_dir="/tmp" || die "Test failed, default flag values."

tensorflow/core/platform/posix/test.cc

@@ -181,10 +181,16 @@ int PickUnusedPortOrDie() {
 }
 
 string TensorFlowSrcRoot() {
-  // 'bazel test' sets TEST_SRCDIR
+  // 'bazel test' sets TEST_SRCDIR, and also TEST_WORKSPACE if a new
+  // enough version of bazel is used.
   const char* env = getenv("TEST_SRCDIR");
+  const char* workspace = getenv("TEST_WORKSPACE");
   if (env && env[0] != '\0') {
-    return strings::StrCat(env, "/tensorflow");
+    if (workspace && workspace[0] != '\0') {
+      return strings::StrCat(env, "/", workspace, "/tensorflow");
+    } else {
+      return strings::StrCat(env, "/tensorflow");
+    }
   } else {
     LOG(WARNING) << "TEST_SRCDIR environment variable not set: "
                  << "using $PWD/tensorflow as TensorFlowSrcRoot() for tests.";

tensorflow/examples/skflow/examples_test.sh

@@ -15,7 +15,21 @@
 
 # This script excercises the examples of using SkFlow.
 
-SKFLOW_EXAMPLE_BASE_DIR=$TEST_SRCDIR/tensorflow/examples/skflow
+DIR="$TEST_SRCDIR"
+
+# Check if TEST_WORKSPACE is defined, and set as empty string if not.
+if [ -z "${TEST_WORKSPACE-}" ]
+then
+  TEST_WORKSPACE=""
+fi
+
+if [ ! -z "$TEST_WORKSPACE" ]
+then
+  DIR="$DIR"/"$TEST_WORKSPACE"
+fi
+
+SKFLOW_EXAMPLE_BASE_DIR=$DIR/tensorflow/examples/skflow
+
 
 function test() {
   echo "Test "$1":"