diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2015-03-19 17:13:43 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2015-03-19 17:13:43 (GMT) |
| commit | 81aa36a8a95935cc1d579858de47496a9a2020fa (patch) | |
| tree | aa073a311c1e3380e26592b85e437322757f2921 /src/disk_interface_test.cc | |
| parent | e1f9c8d8534374b37dfcfc6772ad22a88b32ef85 (diff) | |
| parent | b334523f1da03adfcd23b6e7e7a66c8fcbf87840 (diff) | |
| download | Ninja-81aa36a8a95935cc1d579858de47496a9a2020fa.zip Ninja-81aa36a8a95935cc1d579858de47496a9a2020fa.tar.gz Ninja-81aa36a8a95935cc1d579858de47496a9a2020fa.tar.bz2 | |
Merge pull request #937 from nico/statfix
Make failing stat() calls abort the build.
Diffstat (limited to 'src/disk_interface_test.cc')
| -rw-r--r-- | src/disk_interface_test.cc | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/src/disk_interface_test.cc b/src/disk_interface_test.cc index 05d509c..658fffd 100644 --- a/src/disk_interface_test.cc +++ b/src/disk_interface_test.cc @@ -204,7 +204,9 @@ TEST_F(StatTest, Simple) { "build out: cat in\n")); Node* out = GetNode("out"); - out->Stat(this); + string err; + EXPECT_TRUE(out->Stat(this, &err)); + EXPECT_EQ("", err); ASSERT_EQ(1u, stats_.size()); scan_.RecomputeDirty(out->in_edge(), NULL); ASSERT_EQ(2u, stats_.size()); @@ -218,7 +220,9 @@ TEST_F(StatTest, TwoStep) { "build mid: cat in\n")); Node* out = GetNode("out"); - out->Stat(this); + string err; + EXPECT_TRUE(out->Stat(this, &err)); + EXPECT_EQ("", err); ASSERT_EQ(1u, stats_.size()); scan_.RecomputeDirty(out->in_edge(), NULL); ASSERT_EQ(3u, stats_.size()); @@ -236,7 +240,9 @@ TEST_F(StatTest, Tree) { "build mid2: cat in21 in22\n")); Node* out = GetNode("out"); - out->Stat(this); + string err; + EXPECT_TRUE(out->Stat(this, &err)); + EXPECT_EQ("", err); ASSERT_EQ(1u, stats_.size()); scan_.RecomputeDirty(out->in_edge(), NULL); ASSERT_EQ(1u + 6u, stats_.size()); @@ -255,7 +261,9 @@ TEST_F(StatTest, Middle) { mtimes_["out"] = 1; Node* out = GetNode("out"); - out->Stat(this); + string err; + EXPECT_TRUE(out->Stat(this, &err)); + EXPECT_EQ("", err); ASSERT_EQ(1u, stats_.size()); scan_.RecomputeDirty(out->in_edge(), NULL); ASSERT_FALSE(GetNode("in")->dirty()); |