X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=eglib%2Ftest%2Fspawn.c;h=ec30fc8641e0ae08a3b1ee73b5e194b96264788c;hb=839bed6b854902ed08ddc21cab41a0b0d7fe21a7;hp=36cd5740997b0f6f20d3f2e14bcd2e2b6d0e72c0;hpb=dbf19eb41dbd299c4c33d4de35ffe3cf6c669832;p=mono.git

diff --git a/eglib/test/spawn.c b/eglib/test/spawn.c
index 36cd5740997..ec30fc8641e 100644
--- a/eglib/test/spawn.c
+++ b/eglib/test/spawn.c
@@ -1,15 +1,24 @@
+#include <config.h>
 #include <glib.h>
 #include <string.h>
 #include <stdio.h>
+#ifdef HAVE_UNISTD_H
 #include <unistd.h>
+#endif
 #include "test.h"
 
+#ifdef G_OS_WIN32
+#include <io.h>
+#define read _read
+#define close _close
+#endif
+
 RESULT
 test_spawn_sync ()
 {
 	gchar *out;
 	gchar *err;
-	gint status;
+	gint status = -1;
 	GError *error = NULL;
 
 	if (!g_spawn_command_line_sync ("ls", &out, &err, &status, &error))
@@ -49,7 +58,7 @@ g_spawn_async_with_pipes (const gchar *working_directory,
 
 	memset (argv, 0, 15 * sizeof (char *));
 	argv [0] = "ls";
-	if (!g_spawn_async_with_pipes (NULL, argv, NULL, 0, NULL, NULL, &child_pid, NULL, &stdout_fd, NULL, NULL))
+	if (!g_spawn_async_with_pipes (NULL, argv, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &child_pid, NULL, &stdout_fd, NULL, NULL))
 		return FAILED ("1 Failed to run ls");
 	if (child_pid == 0)
 		return FAILED ("2 child pid not returned");
@@ -58,7 +67,6 @@ g_spawn_async_with_pipes (const gchar *working_directory,
 
 	while (read (stdout_fd, buffer, 512) > 0);
 	close (stdout_fd);
-	printf ("Child pid: %d\n", child_pid);
 
 	return OK;
 }
@@ -71,3 +79,4 @@ static Test spawn_tests [] = {
 
 DEFINE_TEST_GROUP_INIT(spawn_tests_init, spawn_tests)
 
+