diff options
| author |  elenairina <elenairina@google.com> | 2017-09-28 06:35:02 -0400 |
|---|---|---|
| committer |  John Cater <jcater@google.com> | 2017-09-28 08:55:19 -0400 |
| commit | 6ee36ef239b25f66afa83e2657bd0b529b1ff50e (patch) | |
| tree | 1088fca210b2f00b656f079811d338ade1af9fc3 /src/test/java/com | |
| parent | a16d16a9c95918eb1731b6122dfb169a3bd3dd03 (diff) | |
Automated rollback of commit 411039319c1c67f2b9c8a7ada9e0a11d9bd4023f.
*** Reason for rollback ***
Breaks coverage for android_test (N/A).
Can be reproduced with unknown commit.
*** Original change description ***
Rollforward change of Java coverage logic.
RELNOTES: None.
*** Original change description ***
Automated rollback of commit 8d6fc64b18c7e35b93f5c43dae1dbd2f8cae2147.
PiperOrigin-RevId: 170322801
Diffstat (limited to 'src/test/java/com')
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java | 4 | ||||
| -rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java | 1 |
2 files changed, 5 insertions, 0 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java index 9faaa5aa4b..a8389f5630 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/java/JavaSkylarkApiTest.java @@ -1008,6 +1008,10 @@ public class JavaSkylarkApiTest extends BuildViewTestCase { args.getCompileTimeJars(), otherArgs.getCompileTimeJars())) { return false; } + if (!nestedSetsOfArtifactHaveTheSameParent( + args.getInstrumentationMetadata(), otherArgs.getInstrumentationMetadata())) { + return false; + } if (!nestedSetsOfArtifactHaveTheSameParent(args.getRuntimeJars(), otherArgs.getRuntimeJars())) { return false; } diff --git a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java index ead884af2a..0622eebc05 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/java/proto/SkylarkJavaLiteProtoLibraryTest.java @@ -297,6 +297,7 @@ public class SkylarkJavaLiteProtoLibraryTest extends BuildViewTestCase { " srcs = ['input1.proto', 'input2.proto'])"); JavaCompilationArgs compilationArgs = getProvider(JavaCompilationArgsProvider.class, rule).getJavaCompilationArgs(); + assertThat(compilationArgs.getInstrumentationMetadata()).isEmpty(); JavaSourceJarsProvider sourceJarsProvider = getProvider(JavaSourceJarsProvider.class, rule); assertThat(sourceJarsProvider).isNotNull(); |