gnome-keyring r1328 - in trunk: . tests

[nnielsen svn gnome org]

Author: nnielsen
Date: Sun Sep 14 22:41:08 2008
New Revision: 1328
URL: http://svn.gnome.org/viewvc/gnome-keyring?rev=1328&view=rev

Log:
	* configure.in:
	* tests/gtest-helpers.c:
	* tests/test-helpers.c: Fix problems compiling with gcc 4.3


Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/tests/gtest-helpers.c
   trunk/tests/test-helpers.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Sun Sep 14 22:41:08 2008
@@ -425,9 +425,12 @@
 	-Wchar-subscripts -Wmissing-declarations -Wmissing-prototypes \
 	-Wnested-externs -Wpointer-arith \
 	-Wcast-align -Wsign-compare \
-	-Werror \
 	$CFLAGS"
 
+	# Disable -Werror for now, because of issues with
+	# strange gtk-doc programs not building cleanly.  
+	# -Werror \ 
+
 	for option in -Wno-strict-aliasing -Wno-sign-compare; do
 		SAVE_CFLAGS="$CFLAGS"
 		CFLAGS="$CFLAGS $option"

Modified: trunk/tests/gtest-helpers.c
==============================================================================
--- trunk/tests/gtest-helpers.c	(original)
+++ trunk/tests/gtest-helpers.c	Sun Sep 14 22:41:08 2008
@@ -29,6 +29,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 
 #include "gtest-helpers.h"
 
@@ -96,11 +97,16 @@
 	gchar *dir, *base;
 
 	dir = g_path_get_dirname (argv0);
-	chdir (dir);
+	if (chdir (dir) < 0)
+		g_warning ("couldn't change directory to: %s: %s", 
+		           dir, g_strerror (errno));
 	
 	base = g_path_get_basename (dir);
-	if (strcmp (base, ".libs") == 0)
-		chdir ("..");
+	if (strcmp (base, ".libs") == 0) {
+		if (chdir ("..") < 0)
+			g_warning ("couldn't change directory to ..: %s",
+			           g_strerror (errno));
+	}
 
 	g_free (base);
 	g_free (dir);

Modified: trunk/tests/test-helpers.c
==============================================================================
--- trunk/tests/test-helpers.c	(original)
+++ trunk/tests/test-helpers.c	Sun Sep 14 22:41:08 2008
@@ -6,6 +6,7 @@
 #include <unistd.h>
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
 
 #include "test-helpers.h"
 
@@ -72,11 +73,16 @@
 	gchar *dir, *base;
 
 	dir = g_path_get_dirname (argv0);
-	chdir (dir);
+	if (chdir (dir) < 0)
+		g_warning ("couldn't change directory to: %s: %s", 
+		           dir, g_strerror (errno));
 	
 	base = g_path_get_basename (dir);
-	if (strcmp (base, ".libs") == 0)
-		chdir ("..");
+	if (strcmp (base, ".libs") == 0) {
+		if (chdir ("..") < 0)
+			g_warning ("couldn't change directory to ..: %s",
+			           g_strerror (errno));
+	}
 
 	g_free (base);
 	g_free (dir);