From 6ef1bb476da8d050347b462b2d8efa1cddeb420f Mon Sep 17 00:00:00 2001 From: Fredy Wijaya Date: Fri, 13 Oct 2023 16:02:28 +0000 Subject: [PATCH] mobile/ci: Deflake Android tests (#30161) Signed-off-by: Fredy Wijaya --- .github/workflows/mobile-android_tests.yml | 79 ++------ mobile/bazel/kotlin_test.bzl | 10 +- mobile/test/java/integration/BUILD | 36 +++- .../io/envoyproxy/envoymobile/engine/BUILD | 18 +- .../envoymobile/engine/testing/BUILD | 9 +- .../io/envoyproxy/envoymobile/utilities/BUILD | 9 +- mobile/test/java/org/chromium/net/BUILD | 36 +++- mobile/test/java/org/chromium/net/impl/BUILD | 9 +- .../test/java/org/chromium/net/testing/BUILD | 29 ++- .../net/testing/Http2TestServerTest.java | 10 +- .../java/org/chromium/net/urlconnection/BUILD | 9 +- mobile/test/kotlin/integration/BUILD | 182 ++++++++++++++---- mobile/test/kotlin/integration/proxying/BUILD | 54 ++++-- .../kotlin/io/envoyproxy/envoymobile/BUILD | 9 +- 14 files changed, 337 insertions(+), 162 deletions(-) diff --git a/.github/workflows/mobile-android_tests.yml b/.github/workflows/mobile-android_tests.yml index e128768ebb7d..f9b381021241 100644 --- a/.github/workflows/mobile-android_tests.yml +++ b/.github/workflows/mobile-android_tests.yml @@ -21,76 +21,37 @@ jobs: permissions: contents: read - kotlintestsmac: + javatestslinux: if: ${{ needs.env.outputs.mobile_android_tests == 'true' }} needs: env permissions: contents: read packages: read - # revert to //test/kotlin/... once fixed - # https://github.com/envoyproxy/envoy-mobile/issues/1932 - name: kotlin_tests_mac - runs-on: macos-12 + name: java_tests_linux + runs-on: ${{ needs.env.outputs.agent_ubuntu }} timeout-minutes: 90 steps: + - name: Pre-cleanup + # Using the defaults in + # https://github.com/envoyproxy/toolshed/blob/main/gh-actions/diskspace/action.yml. + uses: envoyproxy/toolshed/gh-actions/diskspace@actions-v0.0.18 - uses: actions/checkout@v4 - - name: 'Java setup' - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 - with: - java-version: '8' - java-package: jdk - architecture: x64 - distribution: zulu - - name: 'Install dependencies' - run: | - cd mobile - ./ci/mac_ci_setup.sh - - name: 'Run Kotlin library tests' - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - run: | - cd mobile - ./bazelw test \ - --build_tests_only \ - --config=mobile-remote-ci-macos \ - --define=signal_trace=disabled \ - //test/kotlin/io/... - - javatestsmac: - if: ${{ needs.env.outputs.mobile_android_tests == 'true' }} - needs: env - permissions: - contents: read - packages: read - name: java_tests_mac - runs-on: macos-12 - timeout-minutes: 120 - steps: - - uses: actions/checkout@v4 - - name: 'Java setup' - uses: actions/setup-java@0ab4596768b603586c0de567f2430c30f5b0d2b0 - with: - java-version: '8' - java-package: jdk - architecture: x64 - distribution: zulu - - name: 'Install dependencies' - run: | - cd mobile - ./ci/mac_ci_setup.sh - - name: 'Run Java library tests' + - name: Add safe directory + run: git config --global --add safe.directory /__w/envoy/envoy + - name: 'Run Kotlin library integration tests' env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + CC: /opt/llvm/bin/clang + CXX: /opt/llvm/bin/clang++ run: | - cd mobile - ./bazelw test \ - --build_tests_only \ - --config test-android \ - --define envoy_mobile_listener=enabled \ - --config=mobile-remote-ci-macos \ - --define=signal_trace=disabled \ - --define=system-helper=android \ - //test/java/... + docker run --volume="${PWD}:/source" --workdir="/source/mobile" \ + -e GITHUB_TOKEN -e CC -e CXX ${{ needs.env.outputs.build_image_ubuntu_mobile }} \ + ./bazelw test \ + --build_tests_only \ + --config=test-android \ + --config=mobile-remote-ci \ + --define=signal_trace=disabled \ + //test/java/... kotlintestslinux: if: ${{ needs.env.outputs.mobile_android_tests == 'true' }} diff --git a/mobile/bazel/kotlin_test.bzl b/mobile/bazel/kotlin_test.bzl index d8666e7e014b..feee3044f55c 100644 --- a/mobile/bazel/kotlin_test.bzl +++ b/mobile/bazel/kotlin_test.bzl @@ -44,14 +44,13 @@ def jvm_flags(lib_name): # A basic macro to make it easier to declare and run kotlin tests which depend on a JNI lib # This will create the native .so binary (for linux) and a .jnilib (for macOS) look up -def envoy_mobile_jni_kt_test(name, srcs, native_deps = [], deps = [], repository = "", exec_properties = {}): - lib_name = native_lib_name(native_deps[0])[3:] +def envoy_mobile_jni_kt_test(name, srcs, native_lib_name, native_deps = [], deps = [], repository = "", exec_properties = {}): _internal_kt_test( name, srcs, deps, data = native_deps, - jvm_flags = jvm_flags(lib_name), + jvm_flags = jvm_flags(native_lib_name), repository = repository, exec_properties = exec_properties, ) @@ -76,8 +75,7 @@ def envoy_mobile_kt_test(name, srcs, deps = [], repository = "", exec_properties _internal_kt_test(name, srcs, deps, repository = repository, exec_properties = exec_properties) # A basic macro to run android based (robolectric) tests with native dependencies -def envoy_mobile_android_test(name, srcs, deps = [], native_deps = [], repository = "", exec_properties = {}): - lib_name = native_lib_name(native_deps[0])[3:] +def envoy_mobile_android_test(name, srcs, native_lib_name, deps = [], native_deps = [], repository = "", exec_properties = {}): android_library( name = name + "_test_lib", custom_package = "io.envoyproxy.envoymobile.test", @@ -114,6 +112,6 @@ def envoy_mobile_android_test(name, srcs, deps = [], native_deps = [], repositor manifest = repository + "//bazel:test_manifest.xml", custom_package = "io.envoyproxy.envoymobile.tests", test_class = "io.envoyproxy.envoymobile.bazel.EnvoyMobileTestSuite", - jvm_flags = jvm_flags(lib_name), + jvm_flags = jvm_flags(native_lib_name), exec_properties = exec_properties, ) diff --git a/mobile/test/java/integration/BUILD b/mobile/test/java/integration/BUILD index 73b0ea69f7bc..b908a5d7106f 100644 --- a/mobile/test/java/integration/BUILD +++ b/mobile/test/java/integration/BUILD @@ -16,8 +16,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", ], @@ -34,8 +39,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", "//test/java/io/envoyproxy/envoymobile/engine/testing", @@ -53,8 +63,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", "//test/java/io/envoyproxy/envoymobile/engine/testing", @@ -72,8 +87,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", "//test/java/io/envoyproxy/envoymobile/engine/testing", diff --git a/mobile/test/java/io/envoyproxy/envoymobile/engine/BUILD b/mobile/test/java/io/envoyproxy/envoymobile/engine/BUILD index 071068ca711e..69211f0c623e 100644 --- a/mobile/test/java/io/envoyproxy/envoymobile/engine/BUILD +++ b/mobile/test/java/io/envoyproxy/envoymobile/engine/BUILD @@ -9,8 +9,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", "//test/java/io/envoyproxy/envoymobile/engine/testing", @@ -44,8 +49,13 @@ envoy_mobile_android_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib", "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib", diff --git a/mobile/test/java/io/envoyproxy/envoymobile/engine/testing/BUILD b/mobile/test/java/io/envoyproxy/envoymobile/engine/testing/BUILD index c25d9390608c..32e1afd35d2c 100644 --- a/mobile/test/java/io/envoyproxy/envoymobile/engine/testing/BUILD +++ b/mobile/test/java/io/envoyproxy/envoymobile/engine/testing/BUILD @@ -32,8 +32,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ ":testing", "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", diff --git a/mobile/test/java/io/envoyproxy/envoymobile/utilities/BUILD b/mobile/test/java/io/envoyproxy/envoymobile/utilities/BUILD index 67bbba18c17e..6447ebe5664e 100644 --- a/mobile/test/java/io/envoyproxy/envoymobile/utilities/BUILD +++ b/mobile/test/java/io/envoyproxy/envoymobile/utilities/BUILD @@ -12,8 +12,13 @@ envoy_mobile_android_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib", "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib", diff --git a/mobile/test/java/org/chromium/net/BUILD b/mobile/test/java/org/chromium/net/BUILD index 6f67363de3dd..0fc8c35c119e 100644 --- a/mobile/test/java/org/chromium/net/BUILD +++ b/mobile/test/java/org/chromium/net/BUILD @@ -23,8 +23,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib", "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib", @@ -48,8 +53,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib", "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib", @@ -72,8 +82,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib", "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib", @@ -96,8 +111,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib", "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib", diff --git a/mobile/test/java/org/chromium/net/impl/BUILD b/mobile/test/java/org/chromium/net/impl/BUILD index 51189b5a5091..c728a40003c3 100644 --- a/mobile/test/java/org/chromium/net/impl/BUILD +++ b/mobile/test/java/org/chromium/net/impl/BUILD @@ -21,8 +21,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib", "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib", diff --git a/mobile/test/java/org/chromium/net/testing/BUILD b/mobile/test/java/org/chromium/net/testing/BUILD index e17fc3b4c738..88d9eb76769a 100644 --- a/mobile/test/java/org/chromium/net/testing/BUILD +++ b/mobile/test/java/org/chromium/net/testing/BUILD @@ -1,5 +1,5 @@ -load("@envoy//bazel:envoy_build_system.bzl", "envoy_package") load("@build_bazel_rules_android//android:rules.bzl", "android_library") +load("@envoy//bazel:envoy_build_system.bzl", "envoy_package") load("@envoy_mobile//bazel:kotlin_test.bzl", "envoy_mobile_android_test") licenses(["notice"]) # Apache 2 @@ -62,8 +62,13 @@ envoy_mobile_android_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ ":testing", "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib", @@ -85,8 +90,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ ":testing", "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", @@ -104,8 +114,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ ":testing", "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", diff --git a/mobile/test/java/org/chromium/net/testing/Http2TestServerTest.java b/mobile/test/java/org/chromium/net/testing/Http2TestServerTest.java index 411a17f4a9b9..cd79c3515d1e 100644 --- a/mobile/test/java/org/chromium/net/testing/Http2TestServerTest.java +++ b/mobile/test/java/org/chromium/net/testing/Http2TestServerTest.java @@ -8,7 +8,6 @@ import static org.junit.Assert.assertNotNull; import android.content.Context; import androidx.test.core.app.ApplicationProvider; -import androidx.test.ext.junit.runners.AndroidJUnit4; import io.envoyproxy.envoymobile.utilities.AndroidNetworkLibrary; import io.envoyproxy.envoymobile.AndroidEngineBuilder; import io.envoyproxy.envoymobile.Engine; @@ -29,17 +28,13 @@ import java.util.concurrent.Executors; import java.util.concurrent.atomic.AtomicBoolean; import java.util.concurrent.atomic.AtomicReference; -import java.nio.file.Files; -import java.nio.file.Path; -import java.nio.file.Paths; import org.junit.After; import org.junit.Before; import org.junit.BeforeClass; +import org.junit.Ignore; import org.junit.Test; import org.junit.runner.RunWith; import org.robolectric.RobolectricTestRunner; -import java.nio.charset.StandardCharsets; -import org.chromium.net.testing.CertTestUtil; import io.envoyproxy.envoymobile.utilities.FakeX509Util; @RunWith(RobolectricTestRunner.class) @@ -96,10 +91,10 @@ private void getSchemeIsHttps(boolean enablePlatformCertificatesValidation, Response response = sendRequest(requestScenario); + assertThat(response.getEnvoyError()).isNull(); assertThat(response.getHeaders().getHttpStatus()).isEqualTo(200); assertThat(response.getBodyAsString()).contains(":scheme: https"); assertThat(response.getHeaders().value("x-envoy-upstream-alpn")).containsExactly("h2"); - assertThat(response.getEnvoyError()).isNull(); } @Test @@ -107,6 +102,7 @@ public void testGetRequest() throws Exception { getSchemeIsHttps(false, TrustChainVerification.ACCEPT_UNTRUSTED); } + @Ignore @Test public void testGetRequestWithPlatformCertValidatorSuccess() throws Exception { getSchemeIsHttps(true, TrustChainVerification.VERIFY_TRUST_CHAIN); diff --git a/mobile/test/java/org/chromium/net/urlconnection/BUILD b/mobile/test/java/org/chromium/net/urlconnection/BUILD index 8d17d77fe40e..9766dcb403d9 100644 --- a/mobile/test/java/org/chromium/net/urlconnection/BUILD +++ b/mobile/test/java/org/chromium/net/urlconnection/BUILD @@ -23,8 +23,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/java/io/envoyproxy/envoymobile/engine:envoy_base_engine_lib", "//library/java/io/envoyproxy/envoymobile/engine:envoy_engine_lib", diff --git a/mobile/test/kotlin/integration/BUILD b/mobile/test/kotlin/integration/BUILD index 134f98dd18d1..cc504cea3408 100644 --- a/mobile/test/kotlin/integration/BUILD +++ b/mobile/test/kotlin/integration/BUILD @@ -1,5 +1,5 @@ -load("@envoy_mobile//bazel:kotlin_test.bzl", "envoy_mobile_android_test", "envoy_mobile_jni_kt_test") load("@envoy_mobile//bazel:kotlin_lib.bzl", "envoy_mobile_kt_library") +load("@envoy_mobile//bazel:kotlin_test.bzl", "envoy_mobile_android_test", "envoy_mobile_jni_kt_test") envoy_mobile_jni_kt_test( name = "engine_start_test", @@ -8,8 +8,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -22,8 +27,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -36,8 +46,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -50,8 +65,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -64,8 +84,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -79,8 +104,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -93,8 +123,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -107,8 +142,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -121,8 +161,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -135,8 +180,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -149,8 +199,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -167,8 +222,13 @@ envoy_mobile_jni_kt_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -185,8 +245,13 @@ envoy_mobile_jni_kt_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -199,8 +264,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -213,8 +283,13 @@ envoy_mobile_android_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", "//test/java/io/envoyproxy/envoymobile/engine/testing", @@ -228,8 +303,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -242,8 +322,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -256,8 +341,13 @@ envoy_mobile_jni_kt_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ], @@ -275,8 +365,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", @@ -290,8 +385,13 @@ envoy_mobile_android_test( ], native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ ":test_utilities", "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", diff --git a/mobile/test/kotlin/integration/proxying/BUILD b/mobile/test/kotlin/integration/proxying/BUILD index a19133bdbce3..9579c256cc41 100644 --- a/mobile/test/kotlin/integration/proxying/BUILD +++ b/mobile/test/kotlin/integration/proxying/BUILD @@ -23,8 +23,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_and_listener_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", @@ -44,8 +49,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_and_listener_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", @@ -65,8 +75,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_and_listener_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", @@ -86,8 +101,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_and_listener_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", @@ -107,8 +127,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_and_listener_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", @@ -128,8 +153,13 @@ envoy_mobile_android_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_and_listener_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_and_listener_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", "//library/kotlin/io/envoyproxy/envoymobile:envoy_lib", diff --git a/mobile/test/kotlin/io/envoyproxy/envoymobile/BUILD b/mobile/test/kotlin/io/envoyproxy/envoymobile/BUILD index 4f052d6aceef..05d87d1b14be 100644 --- a/mobile/test/kotlin/io/envoyproxy/envoymobile/BUILD +++ b/mobile/test/kotlin/io/envoyproxy/envoymobile/BUILD @@ -13,8 +13,13 @@ envoy_mobile_jni_kt_test( }, native_deps = [ "//test/common/jni:libenvoy_jni_with_test_extensions.so", - "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", - ], + ] + select({ + "@platforms//os:macos": [ + "//test/common/jni:libenvoy_jni_with_test_extensions_jnilib", + ], + "//conditions:default": [], + }), + native_lib_name = "envoy_jni_with_test_extensions", deps = [ "//library/kotlin/io/envoyproxy/envoymobile:envoy_interfaces_lib", ],