commit 85da59fb0ee6ac9ea00fc54e492c4e7600db4663
author cushon <cushon@google.com> Wed Apr 03 11:41:01 2019 -0700
committer Copybara-Service <copybara-worker@google.com> Wed Apr 03 11:42:44 2019 -0700
tree 883dca718050650b8a722bba86d349910174122f
parent 21b759ddf52f6f752637420e710b64eb070c1e1c

Update tests that pass javabase and java_toolchain flags to use toolchain resolution

In particular, use the new starlark java_toolchain_alias and java_runtime_alias rules,
and pass --platforms to tests that override --java_toolchain or --javabase.

PiperOrigin-RevId: 241773704

src/test/shell/integration/java_integration_test.sh

diff --git a/src/test/shell/integration/java_integration_test.sh b/src/test/shell/integration/java_integration_test.sh
index 4b5f12d..9b18d86 100755
--- a/src/test/shell/integration/java_integration_test.sh
+++ b/src/test/shell/integration/java_integration_test.sh
@@ -254,13 +254,36 @@
   mkdir -p "$pkg/jvm"
   cat > "$pkg/jvm/BUILD" <<EOF
 package(default_visibility=["//visibility:public"])
-java_runtime(name='runtime', java_home='$javabase')
+java_runtime(
+    name='runtime',
+    java_home='$javabase',
+)
+constraint_setting(
+    name = 'constraint_setting',
+)
+constraint_value(
+    name = 'constraint',
+    constraint_setting = ':constraint_setting',
+)
+toolchain(
+    name = 'java_runtime_toolchain',
+    toolchain = ':runtime',
+    toolchain_type = '//tools/jdk:runtime_toolchain_type',
+    target_compatible_with = [':constraint'],
+)
+platform(
+    name = 'platform',
+    constraint_values = [":constraint"],
+)
 EOF
 
 
   # Set javabase to an absolute path.
   bazel build //$pkg/java/hello:hello //$pkg/java/hello:hello_deploy.jar \
-      "$stamp_arg" --javabase="//$pkg/jvm:runtime" "$embed_label" >&"$TEST_log" \
+      "$stamp_arg" --javabase="//$pkg/jvm:runtime" \
+      --extra_toolchains="//$pkg/jvm:all,//tools/jdk:all" \
+      --platforms="//$pkg/jvm:platform" \
+      "$embed_label" >&"$TEST_log" \
       || fail "Build failed"
 
   mkdir $pkg/ugly/ || fail "mkdir failed"