1 files changed, 14 insertions, 3 deletions
diff --git a/src/test/shell/bazel/bazel_example_test.sh b/src/test/shell/bazel/bazel_example_test.sh
index 93075fddb6..b9d2aef276 100755
--- a/src/test/shell/bazel/bazel_example_test.sh
+++ b/src/test/shell/bazel/bazel_example_test.sh
@@ -23,9 +23,6 @@ source $(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/test-setup.sh \
 
 function set_up() {
   copy_examples
-  cat > WORKSPACE <<EOF
-workspace(name = "io_bazel")
-EOF
 }
 
 #
@@ -80,6 +77,20 @@ function test_java_test_with_junitrunner() {
   assert_test_ok "${java_native_tests}:custom_with_test_class"
 }
 
+function test_java_test_with_workspace_name() {
+  local java_pkg=examples/java-native/src/main/java/com/example/myproject
+  # Use named workspace and test if we can still execute hello-world
+  bazel clean
+
+  rm -f WORKSPACE
+  cat >WORKSPACE <<'EOF'
+workspace(name = "toto")
+EOF
+
+  assert_build_output ./bazel-bin/${java_pkg}/hello-world ${java_pkg}:hello-world
+  assert_binary_run_from_subdir "bazel-bin/${java_pkg}/hello-world foo" "Hello foo"
+}
+
 function test_genrule_and_genquery() {
   # The --javabase flag is to force the tools/jdk:jdk label to be used
   # so it appears in the dependency list.