Index: util/net/http_transport_test.cc |
diff --git a/util/net/http_transport_test.cc b/util/net/http_transport_test.cc |
index cd8ebe867ee17a976c7f2717673781316b766c29..089cb101001027866e9eb9a7d7bf872e5a595852 100644 |
--- a/util/net/http_transport_test.cc |
+++ b/util/net/http_transport_test.cc |
@@ -30,6 +30,10 @@ |
#include "util/net/http_multipart_builder.h" |
#include "util/test/multiprocess_exec.h" |
+#if defined(OS_WIN) |
+#include <stdlib.h> |
Mark Mentovai
2015/01/21 19:23:17
This header is available on non-Windows, you don’t
scottmg
2015/01/21 19:48:26
Done.
|
+#endif // OS_WIN |
+ |
namespace crashpad { |
namespace test { |
namespace { |
@@ -50,7 +54,17 @@ class HTTPTransportTestFixture : public MultiprocessExec { |
request_validator_(request_validator) { |
// TODO(rsesek): Use a more robust mechanism to locate testdata |
// <https://code.google.com/p/crashpad/issues/detail?id=4>. |
+#if defined(OS_POSIX) |
SetChildCommand("util/net/http_transport_test_server.py", nullptr); |
+#elif defined(OS_WIN) |
+ // Explicitly invoke a shell and python so that python can be found in the |
+ // path, and run the test script. |
+ std::vector<std::string> args; |
+ args.push_back("/c"); |
+ args.push_back("python"); |
+ args.push_back("util/net/http_transport_test_server.py"); |
+ SetChildCommand(getenv("COMSPEC"), &args); |
+#endif // OS_POSIX |
} |
const HTTPHeaders& headers() { return headers_; } |