Enable a few more tests on the nojava platform.
RELNOTES: None.
PiperOrigin-RevId: 245049717
diff --git a/.bazelci/postsubmit.yml b/.bazelci/postsubmit.yml
index 628ceed..21c8a89 100644
--- a/.bazelci/postsubmit.yml
+++ b/.bazelci/postsubmit.yml
@@ -64,6 +64,10 @@
# TODO(iirina): Re-enable after #7952 was released.
- "-//src/test/shell/bazel:embedded_tools_deps_test"
ubuntu1804_nojava:
+ shell_commands:
+ - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
+ android_ndk_repository/android_ndk_repository/' WORKSPACE
+ - rm -f WORKSPACE.bak
build_flags:
- "--javabase=@openjdk11_linux_archive//:runtime"
build_targets:
@@ -79,16 +83,16 @@
- "//src/tools/singlejar/..."
- "//third_party/ijar/..."
- "//tools/aquery_differ/..."
+ - "//tools/android/..."
- "//tools/python/..."
- # We can't run Android tests without an installed Android SDK / NDK.
- - "-//src/test/java/com/google/devtools/build/android/..."
- - "-//src/test/shell/bazel/android/..."
# Currently broken tests on this platform.
# These tests do not work without an installed system JDK:
# (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868)
# TODO(philwo): Use tags instead of an explicit blacklist.
+ - "-//src/test/java/com/google/devtools/build/android/..."
- "-//src/test/py/bazel:launcher_test"
- "-//src/test/py/bazel:runfiles_test"
+ - "-//src/test/shell/bazel/android/..."
- "-//src/test/shell/bazel:bazel_bootstrap_distfile_test"
- "-//src/test/shell/bazel:bazel_coverage_cc_test_gcc"
- "-//src/test/shell/bazel:bazel_coverage_cc_test_llvm"
@@ -112,15 +116,12 @@
- "-//src/test/shell/integration:bazel_sandboxed_worker_test"
- "-//src/test/shell/integration:bazel_worker_test"
- "-//src/test/shell/integration:discard_analysis_cache_test"
- - "-//src/test/shell/integration:discard_graph_edges_test"
- "-//src/test/shell/integration:java_integration_test"
- "-//src/test/shell/integration:jvm_flags_escaping_test"
- "-//src/test/shell/integration:minimal_jdk_test"
- - "-//src/test/shell/integration:nonincremental_builds_test"
- "-//src/test/shell/integration:output_filter_test"
- "-//src/test/shell/integration:stub_finds_runfiles_test"
- "-//src/test/shell/integration:test_test"
- - "-//src/tools/singlejar:zip64_test"
# TODO(iirina): Re-enable after #7952 was released.
- "-//src/test/shell/bazel:embedded_tools_deps_test"
ubuntu1804_java11:
diff --git a/.bazelci/presubmit.yml b/.bazelci/presubmit.yml
index eb8b97e..f632726 100644
--- a/.bazelci/presubmit.yml
+++ b/.bazelci/presubmit.yml
@@ -76,6 +76,10 @@
# Re-enable once fixed: https://github.com/bazelbuild/bazel/issues/4663
- "-//src/test/shell/bazel/android:android_ndk_integration_test"
ubuntu1804_nojava:
+ shell_commands:
+ - sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
+ android_ndk_repository/android_ndk_repository/' WORKSPACE
+ - rm -f WORKSPACE.bak
build_flags:
- "--javabase=@openjdk11_linux_archive//:runtime"
build_targets:
@@ -92,19 +96,19 @@
- "//src/tools/singlejar/..."
- "//src/tools/workspacelog/..."
- "//third_party/ijar/..."
+ - "//tools/android/..."
- "//tools/aquery_differ/..."
- "//tools/python/..."
# Disable Slow Tests
- "-//src/test/shell/bazel:bazel_determinism_test"
- # We can't run Android tests without an installed Android SDK / NDK.
- - "-//src/test/java/com/google/devtools/build/android/..."
- - "-//src/test/shell/bazel/android/..."
# Currently broken tests on this platform.
# These tests do not work without an installed system JDK:
# (see https://github.com/bazelbuild/bazel/issues/6214#issuecomment-424813868)
# TODO(philwo): Use tags instead of an explicit blacklist.
+ - "-//src/test/java/com/google/devtools/build/android/..."
- "-//src/test/py/bazel:launcher_test"
- "-//src/test/py/bazel:runfiles_test"
+ - "-//src/test/shell/bazel/android/..."
- "-//src/test/shell/bazel:bazel_bootstrap_distfile_test"
- "-//src/test/shell/bazel:bazel_coverage_cc_test_gcc"
- "-//src/test/shell/bazel:bazel_coverage_cc_test_llvm"
@@ -128,15 +132,12 @@
- "-//src/test/shell/integration:bazel_sandboxed_worker_test"
- "-//src/test/shell/integration:bazel_worker_test"
- "-//src/test/shell/integration:discard_analysis_cache_test"
- - "-//src/test/shell/integration:discard_graph_edges_test"
- "-//src/test/shell/integration:java_integration_test"
- "-//src/test/shell/integration:jvm_flags_escaping_test"
- "-//src/test/shell/integration:minimal_jdk_test"
- - "-//src/test/shell/integration:nonincremental_builds_test"
- "-//src/test/shell/integration:output_filter_test"
- "-//src/test/shell/integration:stub_finds_runfiles_test"
- "-//src/test/shell/integration:test_test"
- - "-//src/tools/singlejar:zip64_test"
ubuntu1804_java11:
shell_commands:
- sed -i.bak -e 's/^# android_sdk_repository/android_sdk_repository/' -e 's/^#
