gnumeric r17036 - trunk/test

[mortenw svn gnome org]

Author: mortenw
Date: Mon Dec 29 03:15:01 2008
New Revision: 17036
URL: http://svn.gnome.org/viewvc/gnumeric?rev=17036&view=rev

Log:
2008-12-28  Morten Welinder  <terra gnome org>

	* t9999-epilogue.pl: If we haven't installed Gnumeric [to the
	prefix that gconftool-2 was built with] then we're in trouble with
	things like default fontname.

	* GnumericTest.pm (test_valgrind): Don't totally clear out the environment.



Modified:
   trunk/test/ChangeLog
   trunk/test/GnumericTest.pm
   trunk/test/t9999-epilogue.pl

Modified: trunk/test/GnumericTest.pm
==============================================================================
--- trunk/test/GnumericTest.pm	(original)
+++ trunk/test/GnumericTest.pm	Mon Dec 29 03:15:01 2008
@@ -250,7 +250,7 @@
 sub test_valgrind {
     my ($cmd,$uselibtool) = @_;
 
-    local %ENV;
+    local (%ENV) = %ENV;
     $ENV{'G_DEBUG'} .= ':gc-friendly:resident-modules';
     $ENV{'G_SLICE'} = 'always-malloc';
     delete $ENV{'VALGRIND_OPTS'};

Modified: trunk/test/t9999-epilogue.pl
==============================================================================
--- trunk/test/t9999-epilogue.pl	(original)
+++ trunk/test/t9999-epilogue.pl	Mon Dec 29 03:15:01 2008
@@ -25,9 +25,11 @@
 
 # ----------------------------------------
 
-my $deffont = `gconftool-2 -g /apps/gnumeric/core/defaultfont/name`;
+my $deffont = `gconftool-2 -g /apps/gnumeric/core/defaultfont/name 2>/dev/null`;
 chomp $deffont;
-if ($deffont ne 'Sans') {
+if ($deffont eq '') {
+    print STDERR "Warning: the default font is not set.\n";
+} elsif ($deffont ne 'Sans') {
     print STDERR "Warning: the default font is \"$deffont\", not \"Sans\".  This may affect tests.\n";
 }