summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNico Weber <nicolasweber@gmx.de>2013-09-08 02:16:49 (GMT)
committerNico Weber <nicolasweber@gmx.de>2013-09-08 02:16:49 (GMT)
commite36590b781d956acf9711da311d0934471f95643 (patch)
tree5ac7857d023efebbe37371ef1f581de31f702e63 /src
parent69730cefd5feef13351f59cd49234e3aa847185a (diff)
parent97f9766537af211d2a40ca8036a75adc2504f980 (diff)
downloadNinja-e36590b781d956acf9711da311d0934471f95643.zip
Ninja-e36590b781d956acf9711da311d0934471f95643.tar.gz
Ninja-e36590b781d956acf9711da311d0934471f95643.tar.bz2
Merge pull request #655 from nico/simp
Simplify.
Diffstat (limited to 'src')
-rw-r--r--src/build_test.cc5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/build_test.cc b/src/build_test.cc
index 3c117f4..e206cd8 100644
--- a/src/build_test.cc
+++ b/src/build_test.cc
@@ -487,12 +487,11 @@ void BuildTest::RebuildTarget(const string& target, const char* manifest,
command_runner_.commands_ran_.clear();
builder.command_runner_.reset(&command_runner_);
- bool build_res = true;
if (!builder.AlreadyUpToDate()) {
- build_res = builder.Build(&err);
+ bool build_res = builder.Build(&err);
+ EXPECT_TRUE(build_res) << "builder.Build(&err)";
}
builder.command_runner_.release();
- EXPECT_TRUE(build_res) << "builder.Build(&err)";
}
bool FakeCommandRunner::CanRunMore() {