diff options
| author | Scott Graham <scottmg@chromium.org> | 2014-10-30 22:34:25 (GMT) |
|---|---|---|
| committer | Scott Graham <scottmg@chromium.org> | 2014-10-30 22:34:25 (GMT) |
| commit | 65151e7eefce514febd0a9676c5363c6d4c54b66 (patch) | |
| tree | 8458820f009b6a20b00adeb129d5055b281d2386 /src/build_test.cc | |
| parent | b92c1a4fd731df4c1a408023cd0d0b691bf79f2f (diff) | |
| download | Ninja-65151e7eefce514febd0a9676c5363c6d4c54b66.zip Ninja-65151e7eefce514febd0a9676c5363c6d4c54b66.tar.gz Ninja-65151e7eefce514febd0a9676c5363c6d4c54b66.tar.bz2 | |
CanonicalizePath handles \ on Windows
Diffstat (limited to 'src/build_test.cc')
| -rw-r--r-- | src/build_test.cc | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/src/build_test.cc b/src/build_test.cc index 6336206..a5b0972 100644 --- a/src/build_test.cc +++ b/src/build_test.cc @@ -755,7 +755,7 @@ TEST_F(BuildTest, MakeDirs) { #ifdef _WIN32 ASSERT_NO_FATAL_FAILURE(AssertParse(&state_, "build subdir\\dir2\\file: cat in1\n")); - EXPECT_TRUE(builder_.AddTarget("subdir\\dir2\\file", &err)); + EXPECT_TRUE(builder_.AddTarget("subdir/dir2/file", &err)); #else ASSERT_NO_FATAL_FAILURE(AssertParse(&state_, "build subdir/dir2/file: cat in1\n")); @@ -767,11 +767,7 @@ TEST_F(BuildTest, MakeDirs) { ASSERT_EQ("", err); ASSERT_EQ(2u, fs_.directories_made_.size()); EXPECT_EQ("subdir", fs_.directories_made_[0]); -#ifdef _WIN32 - EXPECT_EQ("subdir\\dir2", fs_.directories_made_[1]); -#else EXPECT_EQ("subdir/dir2", fs_.directories_made_[1]); -#endif } TEST_F(BuildTest, DepFileMissing) { |