Reenable test after java.desktop removal.
RELNOTES: none
PiperOrigin-RevId: 245024239
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index c3649df..628ceed 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -21,8 +21,6 @@
- "//tools/python/..."
# TODO(iirina): Re-enable after #7952 was released.
- "-//src/test/shell/bazel:embedded_tools_deps_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
ubuntu1604:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -44,8 +42,6 @@
- "//tools/python/..."
# TODO(iirina): Re-enable after #7952 was released.
- "-//src/test/shell/bazel:embedded_tools_deps_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
ubuntu1804:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -67,8 +63,6 @@
- "//tools/python/..."
# TODO(iirina): Re-enable after #7952 was released.
- "-//src/test/shell/bazel:embedded_tools_deps_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
ubuntu1804_nojava:
build_flags:
- "--javabase=@openjdk11_linux_archive//:runtime"
@@ -129,8 +123,6 @@
- "-//src/tools/singlejar:zip64_test"
# TODO(iirina): Re-enable after #7952 was released.
- "-//src/test/shell/bazel:embedded_tools_deps_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
ubuntu1804_java11:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -157,8 +149,6 @@
- "-//src/test/shell/bazel:bazel_bootstrap_distfile_test"
# TODO(iirina): Re-enable after #7952 was released.
- "-//src/test/shell/bazel:embedded_tools_deps_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
macos:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -190,8 +180,6 @@
- "-//src/test/shell/bazel:bazel_cc_code_coverage_test"
# TODO(iirina): Re-enable after #7952 was released.
- "-//src/test/shell/bazel:embedded_tools_deps_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
windows:
batch_commands:
- powershell -Command "(Get-Content WORKSPACE) -Replace '# android_', 'android_' | Set-Content WORKSPACE"
@@ -215,8 +203,6 @@
- "//src:all_windows_tests"
# TODO(iirina): Re-enable after #7952 was released.
- "-//src/test/shell/bazel:embedded_tools_deps_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
rbe_ubuntu1604:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index 0019ab3..eb8b97e 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -25,8 +25,6 @@
- "-//src/test/shell/bazel:bazel_determinism_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
- "-//src/test/shell/bazel/android:android_ndk_integration_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
ubuntu1604:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -52,8 +50,6 @@
- "-//src/test/shell/bazel:bazel_determinism_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
- "-//src/test/shell/bazel/android:android_ndk_integration_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
ubuntu1804:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -79,8 +75,6 @@
- "-//src/test/shell/bazel:bazel_determinism_test"
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
- "-//src/test/shell/bazel/android:android_ndk_integration_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
ubuntu1804_nojava:
build_flags:
- "--javabase=@openjdk11_linux_archive//:runtime"
@@ -143,8 +137,6 @@
- "-//src/test/shell/integration:stub_finds_runfiles_test"
- "-//src/test/shell/integration:test_test"
- "-//src/tools/singlejar:zip64_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
ubuntu1804_java11:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -175,8 +167,6 @@
- "-//src/test/shell/bazel:maven_test"
# Re-enable once bootstrap works with Java 11
- "-//src/test/shell/bazel:bazel_bootstrap_distfile_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
macos:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
@@ -223,8 +213,6 @@
- "-//src/test/shell/bazel/android:aar_integration_test"
- "-//src/test/shell/bazel/android:android_integration_test"
- "-//src/test/shell/integration:minimal_jdk_test"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
windows:
batch_commands:
- powershell -Command "(Get-Content WORKSPACE) -Replace '# android_', 'android_' | Set-Content WORKSPACE"
@@ -246,8 +234,6 @@
test_targets:
- "--"
- "//src:all_windows_tests"
- # TODO(twerth): Re-enable after java.desktop has been removed.
- - "-//src/test/shell/bazel:jdeps_test"
rbe_ubuntu1604:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/'
