r3997 - in trunk/sfi: . tests

[timj svn gnome org]

Author: timj
Date: 2006-10-21 11:41:40 -0400 (Sat, 21 Oct 2006)
New Revision: 3997

Modified:
   trunk/sfi/ChangeLog
   trunk/sfi/sfitests.h
   trunk/sfi/sfiwrapper.cc
   trunk/sfi/tests/misctests.c
Log:
Sat Oct 21 17:29:05 2006  Tim Janik  <timj gtk org>

        * sfitests.h, sfiwrapper.cc: adapt to init settings changes.




Modified: trunk/sfi/ChangeLog
===================================================================
--- trunk/sfi/ChangeLog	2006-10-21 15:17:45 UTC (rev 3996)
+++ trunk/sfi/ChangeLog	2006-10-21 15:41:40 UTC (rev 3997)
@@ -1,3 +1,7 @@
+Sat Oct 21 17:29:05 2006  Tim Janik  <timj gtk org>
+
+	* sfitests.h, sfiwrapper.cc: adapt to init settings changes.
+
 Sat Oct  7 23:01:54 2006  Tim Janik  <timj gtk org>
 
 	* sfitests.h: header file to be included by test programs.

Modified: trunk/sfi/sfitests.h
===================================================================
--- trunk/sfi/sfitests.h	2006-10-21 15:17:45 UTC (rev 3996)
+++ trunk/sfi/sfitests.h	2006-10-21 15:41:40 UTC (rev 3997)
@@ -23,7 +23,7 @@
 #include <birnet/birnettests.h>
 
 /* --- test initialization --- */
-static void
+static void BIRNET_UNUSED
 sfi_init_test (int          *argcp,
 	       char       ***argvp,
 	       SfiInitValue *nvalues)
@@ -33,6 +33,7 @@
     nvalues = &empty_init_value;
   SfiInitValue jvalues[] = {
     { "stand-alone", "true" },
+    { "birnet-test-parse-args", "true" },
     { NULL }
   };
   guint i, j = 0, n = 0;

Modified: trunk/sfi/sfiwrapper.cc
===================================================================
--- trunk/sfi/sfiwrapper.cc	2006-10-21 15:17:45 UTC (rev 3996)
+++ trunk/sfi/sfiwrapper.cc	2006-10-21 15:41:40 UTC (rev 3997)
@@ -55,7 +55,7 @@
 SfiInitSettings
 sfi_init_settings (void)
 {
-  return *::Birnet::birnet_init_settings;
+  return ::Birnet::init_settings();
 }
 
 /* --- CPU Info --- */

Modified: trunk/sfi/tests/misctests.c
===================================================================
--- trunk/sfi/tests/misctests.c	2006-10-21 15:17:45 UTC (rev 3996)
+++ trunk/sfi/tests/misctests.c	2006-10-21 15:41:40 UTC (rev 3997)
@@ -19,7 +19,6 @@
 #undef G_LOG_DOMAIN
 #define  G_LOG_DOMAIN __FILE__
 // #define TEST_VERBOSE
-#include <birnet/birnettests.h>
 #include <sfi/sfitests.h>
 #include <unistd.h>
 #include <string.h>