summaryrefslogtreecommitdiffstats
path: root/src/subprocess_test.cc
diff options
context:
space:
mode:
authorPhilip Craig <philip@pobox.com>2011-05-29 08:18:49 (GMT)
committerPhilip Craig <philip@pobox.com>2011-05-29 08:18:49 (GMT)
commit820ecab645cf4a200679a938c8b6b971de348f00 (patch)
treebd4f4b2968a9462c43c1f32391551bccb92dc944 /src/subprocess_test.cc
parent7fa1410f29aaa964a4f3730b13748f1e5462394f (diff)
downloadNinja-820ecab645cf4a200679a938c8b6b971de348f00.zip
Ninja-820ecab645cf4a200679a938c8b6b971de348f00.tar.gz
Ninja-820ecab645cf4a200679a938c8b6b971de348f00.tar.bz2
mingw ninja_test links and passes. (as do linux and native VS2010)
Use chsize instead of truncate for mingw compatibility SubprocessTest uses DoWork to force Subprocesses to execute Drop GoodCommandStdOut test as it is tested in SetWithSingle
Diffstat (limited to 'src/subprocess_test.cc')
-rw-r--r--src/subprocess_test.cc27
1 files changed, 7 insertions, 20 deletions
diff --git a/src/subprocess_test.cc b/src/subprocess_test.cc
index b446e13..14d69f0 100644
--- a/src/subprocess_test.cc
+++ b/src/subprocess_test.cc
@@ -30,32 +30,19 @@ struct SubprocessTest : public testing::Test {
} // anonymous namespace
-// Run a command that succeeds and emits to stdout.
-TEST_F(SubprocessTest, GoodCommandStdout) {
- Subprocess ls;
- EXPECT_TRUE(ls.Start(&subprocs_, kSimpleCommand));
-
- while (!ls.Done()) {
- // Pretend we discovered that stdout was ready for writing.
- ls.OnPipeReady();
- }
-
- EXPECT_TRUE(ls.Finish());
- EXPECT_NE("", ls.GetOutput());
-}
-
// Run a command that fails and emits to stderr.
TEST_F(SubprocessTest, BadCommandStderr) {
- Subprocess subproc;
- EXPECT_TRUE(subproc.Start(&subprocs_, "ninja_no_such_command"));
+ Subprocess* subproc = new Subprocess;
+ EXPECT_TRUE(subproc->Start(&subprocs_, "ninja_no_such_command"));
+ subprocs_.Add(subproc);
- while (!subproc.Done()) {
+ while (!subproc->Done()) {
// Pretend we discovered that stderr was ready for writing.
- subproc.OnPipeReady();
+ subprocs_.DoWork();
}
- EXPECT_FALSE(subproc.Finish());
- EXPECT_NE("", subproc.GetOutput());
+ EXPECT_FALSE(subproc->Finish());
+ EXPECT_NE("", subproc->GetOutput());
}
TEST_F(SubprocessTest, SetWithSingle) {