diff options
| author | bcorso <bcorso@google.com> | 2018-04-16 08:20:45 -0700 |
|---|---|---|
| committer | Ron Shapiro <shapiro.rd@gmail.com> | 2018-04-19 12:44:58 -0400 |
| commit | ff4550eeb32be6682cc55e973004cb2bac560645 (patch) | |
| tree | a9ca44ee1e4a14b4f47545539dad11df9eb79077 /test_defs.bzl | |
| parent | e235f0eb0aec840423c965a5e4894798925ba008 (diff) | |
| download | dagger2-ff4550eeb32be6682cc55e973004cb2bac560645.tar.gz | |
Pass variant javacopts to Dagger's functional tests.
We were only passing the variant javacopts to the libraries of those functional tests. However, that silently fails to apply the javacopts when the @Component is defined in the test class itself, since the javacopts were not applied to the test classes.
-------------
Created by MOE: https://github.com/google/moe
MOE_MIGRATED_REVID=193042437
Diffstat (limited to 'test_defs.bzl')
| -rw-r--r-- | test_defs.bzl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/test_defs.bzl b/test_defs.bzl index 2f96caf15..1b42eb466 100644 --- a/test_defs.bzl +++ b/test_defs.bzl @@ -39,10 +39,10 @@ def _GenTests(library_rule_type, test_rule_type, name, srcs, deps, test_only_dep plugins, javacopts, lib_javacopts, test_javacopts) if functional: - for (variant_name, extra_lib_javacopts) in BUILD_VARIANTS.items(): - variant_lib_javacopts = (lib_javacopts or []) + extra_lib_javacopts + for (variant_name, extra_javacopts) in BUILD_VARIANTS.items(): + variant_javacopts = (javacopts or []) + extra_javacopts _gen_tests(library_rule_type, test_rule_type, name, srcs, deps, test_only_deps, - plugins, javacopts, variant_lib_javacopts, test_javacopts, variant_name) + plugins, variant_javacopts, lib_javacopts, test_javacopts, variant_name) def _gen_tests(library_rule_type, test_rule_type, name, srcs, deps, test_only_deps, plugins, javacopts, lib_javacopts, test_javacopts, variant_name=None): |