summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorNico Weber <thakis@chromium.org>2014-05-13 19:47:08 (GMT)
committerNico Weber <thakis@chromium.org>2014-05-13 19:47:08 (GMT)
commitc57b771cc3e86f80bf16d36eb1b1f3ab2ddde1de (patch)
treee70003011cfec2d635ba5fcda57ab473f8985a42 /src
parent47993664be821df46b009d3e48d251e6266cefc9 (diff)
downloadNinja-c57b771cc3e86f80bf16d36eb1b1f3ab2ddde1de.zip
Ninja-c57b771cc3e86f80bf16d36eb1b1f3ab2ddde1de.tar.gz
Ninja-c57b771cc3e86f80bf16d36eb1b1f3ab2ddde1de.tar.bz2
win console wip: enable test
Diffstat (limited to 'src')
-rw-r--r--src/build_test.cc6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/build_test.cc b/src/build_test.cc
index 119521e..c414c88 100644
--- a/src/build_test.cc
+++ b/src/build_test.cc
@@ -245,7 +245,6 @@ TEST_F(PlanTest, PoolWithDepthOne) {
"build out2: poolcat in\n");
}
-#ifndef _WIN32
TEST_F(PlanTest, ConsolePool) {
TestPoolWithDepthOne(
"rule poolcat\n"
@@ -254,7 +253,6 @@ TEST_F(PlanTest, ConsolePool) {
"build out1: poolcat in\n"
"build out2: poolcat in\n");
}
-#endif
TEST_F(PlanTest, PoolsWithDepthTwo) {
ASSERT_NO_FATAL_FAILURE(AssertParse(&state_,
@@ -1944,12 +1942,12 @@ TEST_F(BuildTest, Console) {
"rule console\n"
" command = console\n"
" pool = console\n"
-"build con: console in.txt\n"));
+"build cons: console in.txt\n"));
fs_.Create("in.txt", "");
string err;
- EXPECT_TRUE(builder_.AddTarget("con", &err));
+ EXPECT_TRUE(builder_.AddTarget("cons", &err));
ASSERT_EQ("", err);
EXPECT_TRUE(builder_.Build(&err));
EXPECT_EQ("", err);