diff options
author | ahumesky <ahumesky@google.com> | 2018-02-21 15:48:03 -0800 |
---|---|---|
committer | Copybara-Service <copybara-piper@google.com> | 2018-02-21 15:50:10 -0800 |
commit | cfb8a74908459d839c755abcc1c68bfa2ed25f2a (patch) | |
tree | eb086f1c09d4a5d41d8d851e034a8c2229a7a0ec /src/test/java/com/google/devtools/build | |
parent | ae24bfef708540b0e34744f98528d8e485052714 (diff) |
PiperOrigin-RevId: 186532302
Diffstat (limited to 'src/test/java/com/google/devtools/build')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java | 15 |
1 files changed, 1 insertions, 14 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java index 7cb4912a27..9881b194b3 100644 --- a/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java +++ b/src/test/java/com/google/devtools/build/lib/rules/proto/ProtoCompileActionBuilderTest.java @@ -83,7 +83,6 @@ public class ProtoCompileActionBuilderTest { artifact("//:dont-care", "import1.proto"), artifact("//:dont-care", "import2.proto")), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - /*directProtoSourceRoots=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), true /* hasProtoSources */); CustomCommandLine cmdLine = @@ -95,7 +94,6 @@ public class ProtoCompileActionBuilderTest { supportData.getDirectProtoSources(), supportData.getTransitiveImports(), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>stableOrder().build(), - /*directProtoSourceRoots=*/ NestedSetBuilder.<String>stableOrder().build(), null /* protosInDirectDeps */, Label.parseAbsoluteUnchecked("//foo:bar"), true /* allowServices */, @@ -122,7 +120,6 @@ public class ProtoCompileActionBuilderTest { NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* protosInDirectDeps */, NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* transitiveImports */, /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - /*directProtoSourceRoots=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), true /* hasProtoSources */); CustomCommandLine cmdLine = @@ -131,7 +128,6 @@ public class ProtoCompileActionBuilderTest { supportData.getDirectProtoSources(), supportData.getTransitiveImports(), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - /*directProtoSourceRoots=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), null /* protosInDirectDeps */, Label.parseAbsoluteUnchecked("//foo:bar"), true /* allowServices */, @@ -159,7 +155,6 @@ public class ProtoCompileActionBuilderTest { artifact("//:dont-care", "import1.proto"), artifact("//:dont-care", "import2.proto")), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - /*directProtoSourceRoots=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), true /* hasProtoSources */); CustomCommandLine cmdLine = @@ -168,7 +163,6 @@ public class ProtoCompileActionBuilderTest { supportData.getDirectProtoSources(), supportData.getTransitiveImports(), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - /*directProtoSourceRoots=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), supportData.getProtosInDirectDeps(), Label.parseAbsoluteUnchecked("//foo:bar"), true /* allowServices */, @@ -195,7 +189,6 @@ public class ProtoCompileActionBuilderTest { NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* protosInDirectDeps */, NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - /*directProtoSourceRoots=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), true /* hasProtoSources */); CustomCommandLine cmdLine = @@ -204,7 +197,6 @@ public class ProtoCompileActionBuilderTest { supportData.getDirectProtoSources(), supportData.getTransitiveImports(), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - /*directProtoSourceRoots=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), supportData.getProtosInDirectDeps(), Label.parseAbsoluteUnchecked("//foo:bar"), false /* allowServices */, @@ -241,7 +233,6 @@ public class ProtoCompileActionBuilderTest { NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* protosInDirectDeps */, NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - /*directProtoSourceRoots=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), true /* hasProtoSources */); CustomCommandLine cmdLine = @@ -250,7 +241,6 @@ public class ProtoCompileActionBuilderTest { supportData.getDirectProtoSources(), supportData.getTransitiveImports(), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - /*directProtoSourceRoots=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), supportData.getProtosInDirectDeps(), Label.parseAbsoluteUnchecked("//foo:bar"), true /* allowServices */, @@ -274,7 +264,6 @@ public class ProtoCompileActionBuilderTest { NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER) /* protosInDirectDeps */, NestedSetBuilder.<Artifact>emptySet(STABLE_ORDER), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - /*directProtoSourceRoots=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), true /* hasProtoSources */); ProtoLangToolchainProvider toolchain1 = @@ -299,7 +288,6 @@ public class ProtoCompileActionBuilderTest { supportData.getDirectProtoSources(), supportData.getTransitiveImports(), /*transitiveProtoPathFlags=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), - /*directProtoSourceRoots=*/ NestedSetBuilder.<String>emptySet(STABLE_ORDER), supportData.getProtosInDirectDeps(), Label.parseAbsoluteUnchecked("//foo:bar"), true /* allowServices */, @@ -395,8 +383,7 @@ public class ProtoCompileActionBuilderTest { NestedSet<Artifact> transitiveImportsNestedSet = NestedSetBuilder.wrap(STABLE_ORDER, transitiveImports); ProtoCompileActionBuilder.addIncludeMapArguments( - commandLine, protosInDirectDependenciesBuilder, - NestedSetBuilder.emptySet(STABLE_ORDER), transitiveImportsNestedSet); + commandLine, protosInDirectDependenciesBuilder, transitiveImportsNestedSet); return commandLine.build().arguments(); } } |