diff options
| author | dstrasburg <dstrasburg@google.com> | 2018-10-04 09:35:26 -0700 |
|---|---|---|
| committer | Ron Shapiro <shapiro.rd@gmail.com> | 2018-10-18 10:01:27 -0400 |
| commit | 57dfca7aba13330dc6554a62bded55396d5e5373 (patch) | |
| tree | 937582e4988f65a4b0c544e6304e4bfa1dbe27b3 /test_defs.bzl | |
| parent | e621fa7fd9e6de0099a47297d27962e01caaa3f4 (diff) | |
| download | dagger2-57dfca7aba13330dc6554a62bded55396d5e5373.tar.gz | |
[Ahead-of-time Subcomponents] Add a flag to gate running the AOT build variants for GenJavaTests and GenRoboelectricTests. Duplicate each call to the above with the flag set. This will allow us to add exceptions (in the srcs exclude glob) as we work through bugs exposed by functional tests.
RELNOTES=n/a
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=215751328
Diffstat (limited to 'test_defs.bzl')
| -rw-r--r-- | test_defs.bzl | 46 |
1 files changed, 29 insertions, 17 deletions
diff --git a/test_defs.bzl b/test_defs.bzl index db13354e4..b78371747 100644 --- a/test_defs.bzl +++ b/test_defs.bzl @@ -18,7 +18,13 @@ BUILD_VARIANTS = { "FastInit": ["-Adagger.fastInit=enabled"], "ExperimentalAndroidMode2": ["-Adagger.experimentalAndroidMode2=enabled"], - "ExperimentalAheadOfTimeSubcomponents": ["-Adagger.experimentalAheadOfTimeSubcomponents=enabled"], +} + +# TODO(b/72748365): Revert cl/215561379 when all functional tests are passing for AOT. +AOT_BUILD_VARIANTS = { + "ExperimentalAheadOfTimeSubcomponents": [ + "-Adagger.experimentalAheadOfTimeSubcomponents=enabled", + ], "FastInitAndAheadOfTimeSubcomponents": [ "-Adagger.fastInit=enabled", "-Adagger.experimentalAheadOfTimeSubcomponents=enabled", @@ -36,13 +42,15 @@ def GenJavaTests( javacopts = None, lib_javacopts = None, test_javacopts = None, - functional = True): + functional = True, + with_aot = False): _GenTests( native.java_library, native.java_test, name, srcs, deps, + with_aot, test_only_deps, plugins, javacopts, @@ -60,7 +68,8 @@ def GenRobolectricTests( javacopts = None, lib_javacopts = None, test_javacopts = None, - manifest_values = None): + manifest_values = None, + with_aot = False): # TODO(ronshapiro): enable these with these instructions: # https://docs.bazel.build/versions/master/be/android.html#android_local_test_examples # We probably want to import all of Robolectric's dependencies into bazel-common because there @@ -73,6 +82,7 @@ def _GenTests( name, srcs, deps, + with_aot, test_only_deps = None, plugins = None, javacopts = None, @@ -80,22 +90,24 @@ def _GenTests( test_javacopts = None, functional = True, test_kwargs = {}): - _gen_tests( - library_rule_type, - test_rule_type, - name, - srcs, - deps, - test_only_deps, - plugins, - javacopts, - lib_javacopts, - test_javacopts, - test_kwargs = test_kwargs, - ) + if not with_aot: + _gen_tests( + library_rule_type, + test_rule_type, + name, + srcs, + deps, + test_only_deps, + plugins, + javacopts, + lib_javacopts, + test_javacopts, + test_kwargs = test_kwargs, + ) if functional: - for (variant_name, extra_javacopts) in BUILD_VARIANTS.items(): + build_variants = AOT_BUILD_VARIANTS if with_aot else BUILD_VARIANTS + for (variant_name, extra_javacopts) in build_variants.items(): variant_javacopts = (javacopts or []) + extra_javacopts _gen_tests( library_rule_type, |