diff options
2 files changed, 10 insertions, 15 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java b/src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java index b5c76b7749..9eff869149 100644 --- a/src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java +++ b/src/main/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformer.java @@ -28,7 +28,6 @@ import com.google.devtools.build.lib.packages.RawAttributeMapper; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.packages.Target; - import java.util.Collection; import java.util.Collections; import java.util.Comparator; @@ -50,8 +49,9 @@ public final class CompileOneDependencyTransformer { * For each input file in the original result, returns a rule in the same package which has the * input file as a source. */ - public ResolvedTargets<Target> transformCompileOneDependency(EventHandler eventHandler, - ResolvedTargets<Target> original) throws TargetParsingException { + public ResolvedTargets<Target> transformCompileOneDependency( + EventHandler eventHandler, ResolvedTargets<Target> original) + throws TargetParsingException, InterruptedException { if (original.hasError()) { return original; } @@ -93,7 +93,7 @@ public final class CompileOneDependencyTransformer { Collection<Label> srcLabels, Label source, Set<Label> visitedRuleLabels) - throws TargetParsingException { + throws TargetParsingException, InterruptedException { if (srcLabels.contains(source)) { return true; } @@ -108,9 +108,6 @@ public final class CompileOneDependencyTransformer { // Just ignore failing sources/packages. We could report them here, but as long as we do // early return, the presence of this error would then be determined by the order of items // in the srcs attribute. A proper error will be created by the subsequent loading. - } catch (InterruptedException e) { - Thread.currentThread().interrupt(); - throw new TargetParsingException("interrupted"); } if (target == null || target instanceof FileTarget) { continue; @@ -135,7 +132,7 @@ public final class CompileOneDependencyTransformer { } private Target transformCompileOneDependency(EventHandler eventHandler, Target target) - throws TargetParsingException { + throws TargetParsingException, InterruptedException { if (!(target instanceof FileTarget)) { throw new TargetParsingException( "--compile_one_dependency target '" + target.getLabel() + "' must be a file"); diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformerTest.java index 3c08bffa83..e8888d0467 100644 --- a/src/test/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformerTest.java +++ b/src/test/java/com/google/devtools/build/lib/pkgcache/CompileOneDependencyTransformerTest.java @@ -25,17 +25,15 @@ import com.google.devtools.build.lib.events.Reporter; import com.google.devtools.build.lib.packages.Target; import com.google.devtools.build.lib.packages.util.PackageLoadingTestCase; import com.google.devtools.build.lib.vfs.Path; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.junit.runners.JUnit4; - import java.io.IOException; import java.util.Arrays; import java.util.HashSet; import java.util.List; import java.util.Set; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.junit.runners.JUnit4; /** * A test for {@link CompileOneDependencyTransformer}. @@ -92,7 +90,7 @@ public class CompileOneDependencyTransformerTest extends PackageLoadingTestCase } private Set<Label> parseListCompileOneDepRelative(String... patterns) - throws TargetParsingException, IOException { + throws TargetParsingException, IOException, InterruptedException { Path foo = scratch.dir("foo"); TargetPatternEvaluator fooOffsetParser = getPackageManager().newTargetPatternEvaluator(); fooOffsetParser.updateOffset(foo.relativeTo(rootDirectory)); |