diff options
| author | U-MATHLETE\John <John@MATHLETE.(none)> | 2011-06-26 11:25:45 (GMT) |
|---|---|---|
| committer | U-MATHLETE\John <John@MATHLETE.(none)> | 2011-06-26 11:25:45 (GMT) |
| commit | f1daa238fd531689627e2a508bf5d5cf39f9312b (patch) | |
| tree | ae7296d8577b76772947c604edb065bef4b1363c /src/subprocess_test.cc | |
| parent | cdb981e337297da7046e4daa5c2e055bf6b8d95b (diff) | |
| download | Ninja-f1daa238fd531689627e2a508bf5d5cf39f9312b.zip Ninja-f1daa238fd531689627e2a508bf5d5cf39f9312b.tar.gz Ninja-f1daa238fd531689627e2a508bf5d5cf39f9312b.tar.bz2 | |
Fix for win32 long command lines:
- remove 'cmd /c' prepend from SubProcess::Start()
- fix the subprocess tests to prepend 'cmd /c' explicitly
Diffstat (limited to 'src/subprocess_test.cc')
| -rw-r--r-- | src/subprocess_test.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/subprocess_test.cc b/src/subprocess_test.cc index 14d69f0..47b7b56 100644 --- a/src/subprocess_test.cc +++ b/src/subprocess_test.cc @@ -19,7 +19,7 @@ namespace { #ifdef _WIN32 -const char* kSimpleCommand = "dir \\"; +const char* kSimpleCommand = "cmd /c dir \\"; #else const char* kSimpleCommand = "ls /"; #endif @@ -33,7 +33,7 @@ struct SubprocessTest : public testing::Test { // Run a command that fails and emits to stderr. TEST_F(SubprocessTest, BadCommandStderr) { Subprocess* subproc = new Subprocess; - EXPECT_TRUE(subproc->Start(&subprocs_, "ninja_no_such_command")); + EXPECT_TRUE(subproc->Start(&subprocs_, "cmd /c ninja_no_such_command")); subprocs_.Add(subproc); while (!subproc->Done()) { @@ -64,8 +64,8 @@ TEST_F(SubprocessTest, SetWithMulti) { const char* kCommands[3] = { kSimpleCommand, #ifdef _WIN32 - "echo hi", - "time /t", + "cmd /c echo hi", + "cmd /c time /t", #else "whoami", "pwd", |