aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Damien Martin-Guillerez <dmarting@google.com>2016-03-03 19:29:54 +0000
committerGravatar Damien Martin-Guillerez <dmarting@google.com>2016-03-04 12:16:45 +0000
commit191d9804047fe2d19c6ca561b6f8de6ccbdc93fb (patch)
tree88040f41422bf751d9da36f158c68fb129a83491
parentd39569538562986205c5eb208f1c2bd6a73922ea (diff)
RELNOTES: Set --legacy_bazel_java_test to off by default.
-- MOS_MIGRATED_REVID=116272974
-rw-r--r--examples/java-native/src/test/java/com/example/myproject/BUILD3
-rw-r--r--src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java2
-rwxr-xr-xsrc/test/shell/bazel/runfiles_test.sh2
3 files changed, 5 insertions, 2 deletions
diff --git a/examples/java-native/src/test/java/com/example/myproject/BUILD b/examples/java-native/src/test/java/com/example/myproject/BUILD
index b9d81a1ff8..f3a262db99 100644
--- a/examples/java-native/src/test/java/com/example/myproject/BUILD
+++ b/examples/java-native/src/test/java/com/example/myproject/BUILD
@@ -1,6 +1,7 @@
java_test(
name = "hello",
srcs = ["TestHello.java"],
+ test_class = "com.example.myproject.TestHello",
deps = [
"//examples/java-native/src/main/java/com/example/myproject:hello-lib",
"//third_party:junit4",
@@ -10,6 +11,7 @@ java_test(
java_test(
name = "custom",
srcs = ["TestCustomGreeting.java"],
+ test_class = "com.example.myproject.TestCustomGreeting",
deps = [
"//examples/java-native/src/main/java/com/example/myproject:custom-greeting",
"//third_party:junit4",
@@ -36,6 +38,7 @@ java_test(
java_test(
name = "resource-fail",
srcs = glob(["Test*.java"]),
+ test_class = "com.example.myproject.TestCustomGreeting",
deps = [
"//examples/java-native/src/main/java/com/example/myproject:hello-lib",
"//third_party:junit4",
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
index 1785ab9e7b..1c67211178 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaOptions.java
@@ -405,7 +405,7 @@ public class JavaOptions extends FragmentOptions {
public JavaOptimizationMode javaOptimizationMode;
@Option(name = "legacy_bazel_java_test",
- defaultValue = "true",
+ defaultValue = "false",
category = "undocumented",
help = "Use the legacy mode of Bazel for java_test.")
public boolean legacyBazelJavaTest;
diff --git a/src/test/shell/bazel/runfiles_test.sh b/src/test/shell/bazel/runfiles_test.sh
index afc2c0d4b5..33205b86d2 100755
--- a/src/test/shell/bazel/runfiles_test.sh
+++ b/src/test/shell/bazel/runfiles_test.sh
@@ -36,7 +36,7 @@ EOF
java_test(
name = "foo",
srcs = ["Noise.java"],
- main_class = "Noise",
+ test_class = "Noise",
)
EOF
cat > foo/Noise.java <<EOF