aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test/java/com/google
diff options
context:
space:
mode:
authorGravatar Janak Ramakrishnan <janakr@google.com>2015-09-15 19:37:11 +0000
committerGravatar Florian Weikert <fwe@google.com>2015-09-16 10:17:38 +0000
commitac023bbcb127884e2c14c5c70848c61f149dfbbe (patch)
tree1a0cfc96e4fe1209fe3fc36535f45936823df44d /src/test/java/com/google
parentfe87155b7154f7ef64c7ab095071b148980f035f (diff)
Get rid of transient errors during preprocessing and throw IOExceptions instead. Transient errors were only detected on IOExceptions, but preprocessing doesn't actually throw IOExceptions except if it fails before it even opens the main file, so there's no sense in trying to construct a package in that case.
-- MOS_MIGRATED_REVID=103119445
Diffstat (limited to 'src/test/java/com/google')
-rw-r--r--src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
index 6306e468fb..e1f7271f3e 100644
--- a/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
+++ b/src/test/java/com/google/devtools/build/lib/packages/util/PackageFactoryApparatus.java
@@ -131,11 +131,19 @@ public class PackageFactoryApparatus {
LegacyGlobber globber = new LegacyGlobber(globCache);
ExternalPackage externalPkg = new ExternalPackage.Builder(
buildFile.getParentDirectory().getRelative("WORKSPACE"), "TESTING").build();
- LegacyBuilder resultBuilder = factory.evaluateBuildFile(
- externalPkg, packageId, buildFileAST, buildFile,
- globber, ImmutableList.<Event>of(), ConstantRuleVisibility.PUBLIC, false, false,
- new MakeEnvironment.Builder(), ImmutableMap.<PathFragment, Extension>of(),
- ImmutableList.<Label>of());
+ LegacyBuilder resultBuilder =
+ factory.evaluateBuildFile(
+ externalPkg,
+ packageId,
+ buildFileAST,
+ buildFile,
+ globber,
+ ImmutableList.<Event>of(),
+ ConstantRuleVisibility.PUBLIC,
+ false,
+ new MakeEnvironment.Builder(),
+ ImmutableMap.<PathFragment, Extension>of(),
+ ImmutableList.<Label>of());
Package result = resultBuilder.build();
Event.replayEventsOn(events.reporter(), result.getEvents());
return Pair.of(result, globCache);