[cutter-commit 02680] SF.net SVN: cutter:[2686] cutter/trunk

[<ik...@us...>]

Revision: 2686
          http://cutter.svn.sourceforge.net/cutter/?rev=2686&view=rev
Author:   ikezoe
Date:     2009-01-23 00:45:07 +0000 (Fri, 23 Jan 2009)

Log Message:
-----------
	* test/gcutter/test-gcut-egg.c: Define WEXITSTATUS and SIGKILL on
	win32 environment. Use gcut_assert_equal_g_pid instead of
	cut_assert_equal_int.

Modified Paths:
--------------
    cutter/trunk/ChangeLog
    cutter/trunk/test/gcutter/test-gcut-egg.c

Modified: cutter/trunk/ChangeLog
===================================================================
--- cutter/trunk/ChangeLog	2009-01-23 00:39:53 UTC (rev 2685)
+++ cutter/trunk/ChangeLog	2009-01-23 00:45:07 UTC (rev 2686)
@@ -17,6 +17,9 @@
 	* cutter/Makefile.am: Use top_builddir.
 	* gcutter/gcut-assertions.h, gcutter/gcut-assertions-helper.[ch]:
 	Added gcut_assert_equal_g_pid.
+	* test/gcutter/test-gcut-egg.c: Define WEXITSTATUS and SIGKILL on
+	win32 environment. Use gcut_assert_equal_g_pid instead of
+	cut_assert_equal_int.
 
 2009-01-22  Hiroyuki Ikezoe  <poi...@ik...>
 

Modified: cutter/trunk/test/gcutter/test-gcut-egg.c
===================================================================
--- cutter/trunk/test/gcutter/test-gcut-egg.c	2009-01-23 00:39:53 UTC (rev 2685)
+++ cutter/trunk/test/gcutter/test-gcut-egg.c	2009-01-23 00:45:07 UTC (rev 2686)
@@ -119,6 +119,9 @@
 {
     GError *error = NULL;
     guint timeout_id;
+#ifdef G_OS_WIN32
+#define WEXITSTATUS(s) (s)
+#endif
 
     gcut_assert_error(error);
     timeout_id = g_timeout_add_seconds(1, cb_timeout_reaped, &error);
@@ -141,7 +144,7 @@
     egg = gcut_egg_new("echo", "XXX", NULL);
     setup_egg(egg);
 
-    cut_assert_equal_int(0, gcut_egg_get_pid(egg));
+    gcut_assert_equal_g_pid(0, gcut_egg_get_pid(egg));
     gcut_egg_hatch(egg, &error);
     gcut_assert_error(error);
     cut_assert_operator_int(0, !=, gcut_egg_get_pid(egg));
@@ -243,6 +246,9 @@
 {
     GError *error = NULL;
     const gchar command[] = "cat";
+#ifdef G_OS_WIN32
+#define SIGKILL 9
+#endif
 
     egg = gcut_egg_new(command, NULL);
     setup_egg(egg);


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.