summaryrefslogtreecommitdiffstats
path: root/src/subprocess_test.cc
diff options
context:
space:
mode:
authorEvan Martin <martine@danga.com>2011-05-06 21:12:10 (GMT)
committerEvan Martin <martine@danga.com>2011-05-06 21:12:24 (GMT)
commit65b240aec1a5d91d8656ca0a89908dd2698a1ea4 (patch)
treeb92ededd57db2fc574cc21d1c6ceb6df5775af54 /src/subprocess_test.cc
parent849455720cdc8a2582f5bb46393dae242e36d3a0 (diff)
downloadNinja-65b240aec1a5d91d8656ca0a89908dd2698a1ea4.zip
Ninja-65b240aec1a5d91d8656ca0a89908dd2698a1ea4.tar.gz
Ninja-65b240aec1a5d91d8656ca0a89908dd2698a1ea4.tar.bz2
fix tests broken by previous commit
Diffstat (limited to 'src/subprocess_test.cc')
-rw-r--r--src/subprocess_test.cc12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/subprocess_test.cc b/src/subprocess_test.cc
index 5ee3eb7..a72f1cb 100644
--- a/src/subprocess_test.cc
+++ b/src/subprocess_test.cc
@@ -18,10 +18,10 @@
TEST(Subprocess, Ls) {
Subprocess ls;
- EXPECT_TRUE(ls.Start("ls /"));
+ EXPECT_TRUE(ls.Start(NULL, "ls /"));
// Pretend we discovered that stdout was ready for writing.
- ls.OnFDReady();
+ ls.OnPipeReady();
EXPECT_TRUE(ls.Finish());
EXPECT_NE("", ls.GetOutput());
@@ -29,10 +29,10 @@ TEST(Subprocess, Ls) {
TEST(Subprocess, BadCommand) {
Subprocess subproc;
- EXPECT_TRUE(subproc.Start("ninja_no_such_command"));
+ EXPECT_TRUE(subproc.Start(NULL, "ninja_no_such_command"));
// Pretend we discovered that stderr was ready for writing.
- subproc.OnFDReady();
+ subproc.OnPipeReady();
EXPECT_FALSE(subproc.Finish());
EXPECT_NE("", subproc.GetOutput());
@@ -41,7 +41,7 @@ TEST(Subprocess, BadCommand) {
TEST(SubprocessSet, Single) {
SubprocessSet subprocs;
Subprocess* ls = new Subprocess;
- EXPECT_TRUE(ls->Start("ls /"));
+ EXPECT_TRUE(ls->Start(NULL, "ls /"));
subprocs.Add(ls);
while (!ls->Done()) {
@@ -64,7 +64,7 @@ TEST(SubprocessSet, Multi) {
for (int i = 0; i < 3; ++i) {
processes[i] = new Subprocess;
- EXPECT_TRUE(processes[i]->Start(kCommands[i]));
+ EXPECT_TRUE(processes[i]->Start(NULL, kCommands[i]));
subprocs.Add(processes[i]);
}