diff options
| author |  Philipp Wollermann <philwo@google.com> | 2016-07-19 13:48:41 +0000 |
|---|---|---|
| committer |  Dmitry Lomov <dslomov@google.com> | 2016-07-19 18:12:08 +0000 |
| commit | ca5a6743d2a58a86c6c70a9577959ad5c756cde3 (patch) | |
| tree | 85809d68c460e39a9a6fd2660f555a45078a391b /src/test/java/com/google | |
| parent | 893196af8b69177e23904845727bf4e4d43ceb5f (diff) | |
Fix test_simple_java_library to work when Java header compilation is activated.
--
MOS_MIGRATED_REVID=127826324
Diffstat (limited to 'src/test/java/com/google')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/ideinfo/skylarktests/intellij_info_tests.bzl | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/ideinfo/skylarktests/intellij_info_tests.bzl b/src/test/java/com/google/devtools/build/lib/ideinfo/skylarktests/intellij_info_tests.bzl index 3781478776..af7b3817d1 100644 --- a/src/test/java/com/google/devtools/build/lib/ideinfo/skylarktests/intellij_info_tests.bzl +++ b/src/test/java/com/google/devtools/build/lib/ideinfo/skylarktests/intellij_info_tests.bzl @@ -83,9 +83,16 @@ def _test_simple_java_library(ctx): [ctx.label.package + "/skylarktests/testfiles/Simple1.java"], _source_paths(env, info.java_rule_ide_info.sources)) + # When Java header compilation is active, the interface jar is an -hjar.jar instead of an + # -ijar.jar. Try to detect that and test accordingly. + interface_jar_name = "libsimple1-ijar.jar" + for jar in info.java_rule_ide_info.jars: + if "-hjar.jar" in getattr(jar, "interface_jar").relative_path: + interface_jar_name = "libsimple1-hjar.jar" + assert_equals(env, [_jar_expected_string(ctx.label.package, - "libsimple1.jar", "libsimple1-ijar.jar", "libsimple1-src.jar")], + "libsimple1.jar", interface_jar_name, "libsimple1-src.jar")], [_library_artifact_string(env, a) for a in info.java_rule_ide_info.jars]) assert_equals(env, |