Rollback of commit 9dc24effb614f3695c962c4e1d1012e9e2aeb453.

*** Reason for rollback ***

looks like this is probably break []

*** Original change description ***

Bind path to xcrunwrapper in workspace files.

--
MOS_MIGRATED_REVID=120167193

8 files changed, 2 insertions, 57 deletions

diff --git a/BUILD b/BUILD
index f7fea2174c..fc3bb5eb66 100644
--- a/BUILD
+++ b/BUILD
@@ -13,10 +13,7 @@ filegroup(
 filegroup(
     name = "workspace-file",
     srcs = [":WORKSPACE"],
-    visibility = [
-        "//src/test/shell/bazel:__pkg__",
-        "//tools/cpp/test:__pkg__",
-    ],
+    visibility = ["//tools/cpp/test:__pkg__"],
 )
 
 filegroup(
diff --git a/WORKSPACE b/WORKSPACE
index 83c2388af6..05c5117286 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -31,6 +31,3 @@ docker_repository()
 # scripts/workspace_user.sh and uncomment the next two lines.
 # load("/WORKSPACE.user", "android_repositories")
 # android_repositories()
-
-# This allows rules written in skylark to locate apple build tools.
-bind(name = "xcrunwrapper", actual = "@bazel_tools//tools/objc:xcrunwrapper")
diff --git a/src/test/shell/bazel/BUILD b/src/test/shell/bazel/BUILD
index 2762c988ee..678f573ef1 100644
--- a/src/test/shell/bazel/BUILD
+++ b/src/test/shell/bazel/BUILD
@@ -45,7 +45,6 @@ filegroup(
         "testenv.sh",
         "testing_server.py",
         ":langtools-copy",
-        "//:workspace-file",
         "//examples:srcs",
         "//external:bootclasspath",
         "//external:extdir",
@@ -303,16 +302,6 @@ sh_test(
     data = [":test-deps"],
 )
 
-sh_test(
-    name = "bound_targets_test",
-    size = "large",
-    srcs = ["bound_targets_test.sh"],
-    data = [
-        ":objc-deps",
-        ":test-deps",
-    ],
-)
-
 test_suite(
     name = "all_tests",
     visibility = ["//visibility:public"],
diff --git a/src/test/shell/bazel/bound_targets_test.sh b/src/test/shell/bazel/bound_targets_test.sh
deleted file mode 100755
index a83f67bb02..0000000000
--- a/src/test/shell/bazel/bound_targets_test.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/bin/bash
-#
-# Copyright 2016 The Bazel Authors. All rights reserved.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Load test environment
-source $(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/test-setup.sh \
-  || { echo "test-setup.sh not found!" >&2; exit 1; }
-
-function test_build_xcrunwrapper() {
-  setup_objc_test_support
-  bazel build //external:xcrunwrapper || fail "should build xcrunwrapper"
-}
-
-run_suite "bound targets integration test"
diff --git a/src/test/shell/bazel/external_skylark_load_test.sh b/src/test/shell/bazel/external_skylark_load_test.sh
index f3a07269db..bd8318ad87 100755
--- a/src/test/shell/bazel/external_skylark_load_test.sh
+++ b/src/test/shell/bazel/external_skylark_load_test.sh
@@ -46,11 +46,6 @@ function run_external_skylark_load_test() {
   create_new_workspace
   external_repo=${new_workspace_dir}
 
-  # Since we're creating an artifical WORKSPACE file in this test, we must
-  # first remove the symlink to the actual bazel/WORKSPACE file.
-  rm ${WORKSPACE_DIR}/WORKSPACE
-  touch ${WORKSPACE_DIR}/WORKSPACE
-
   cat > ${WORKSPACE_DIR}/WORKSPACE <<EOF
 local_repository(name = "external_repo", path = "${external_repo}")
 EOF
diff --git a/src/test/shell/bazel/local_repository_test.sh b/src/test/shell/bazel/local_repository_test.sh
index 3e90211515..0fad9c95f0 100755
--- a/src/test/shell/bazel/local_repository_test.sh
+++ b/src/test/shell/bazel/local_repository_test.sh
@@ -657,10 +657,6 @@ EOF
 int main() { return 0; };
 EOF
 
-  # Since we're creating an artifical WORKSPACE file in this test, we must
-  # first remove the symlink to the actual bazel/WORKSPACE file.
-  rm ${WORKSPACE_DIR}/WORKSPACE
-  touch ${WORKSPACE_DIR}/WORKSPACE
   cat > WORKSPACE <<EOF
 local_repository(
     name = "r",
diff --git a/src/test/shell/bazel/test-setup.sh b/src/test/shell/bazel/test-setup.sh
index bf825ca5be..8ed875b2cf 100755
--- a/src/test/shell/bazel/test-setup.sh
+++ b/src/test/shell/bazel/test-setup.sh
@@ -366,7 +366,7 @@ function create_new_workspace() {
   ln -s "${junitrunner_path}" tools/jdk/TestRunner_deploy.jar
   ln -s "${ijar_path}" tools/jdk/ijar/ijar
 
-  ln -sv ${workspace_file} WORKSPACE
+  touch WORKSPACE
 }
 
 # Set-up a clean default workspace.
diff --git a/src/test/shell/bazel/testenv.sh b/src/test/shell/bazel/testenv.sh
index 82b720307d..14c39c0766 100755
--- a/src/test/shell/bazel/testenv.sh
+++ b/src/test/shell/bazel/testenv.sh
@@ -23,9 +23,6 @@
 source "${TEST_SRCDIR}/src/test/shell/unittest.bash" || \
   { echo "Failed to source unittest.bash" >&2; exit 1; }
 
-# WORKSPACE file
-workspace_file="${TEST_SRCDIR}/WORKSPACE"
-
 # Bazel
 bazel_tree="${TEST_SRCDIR}/src/test/shell/bazel/doc-srcs.zip"
 bazel="${TEST_SRCDIR}/src/bazel"