Use scm_boot_guile rather than scm_init_guile, for the benefit of

those systems where we can't implement the latter.

test-suite/standalone/test-conversion.c

@@ -1010,10 +1010,9 @@ test_locale_strings ()
   test_11 ("(string #\\f #\\nul)", NULL, 1, 0);
 }
 
-int
-main (int argc, char *argv[])
+static void
+tests (void *data, int argc, char **argv)
 {
-  scm_init_guile();
   test_is_signed_integer ();
   test_is_unsigned_integer ();
   test_to_signed_integer ();
@@ -1024,5 +1023,11 @@ main (int argc, char *argv[])
   test_from_double ();
   test_to_double ();
   test_locale_strings ();
+}
+
+int
+main (int argc, char *argv[])
+{
+  scm_boot_guile (argc, argv, tests, NULL);
   return 0;
 }

test-suite/standalone/test-gh.c

@@ -67,11 +67,16 @@ test_gh_set_substr ()
   assert (string_equal (string, "Frdarnitrnit!"));
 }
 
-int 
+static void
+tests (void *data, int argc, char **argv)
+{
+  test_gh_set_substr ();
+}
+
+int
 main (int argc, char *argv[])
 {
-  scm_init_guile ();
-  test_gh_set_substr ();
+  scm_boot_guile (argc, argv, tests, NULL);
   return 0;
 }
 

test-suite/standalone/test-list.c

@@ -46,10 +46,15 @@ test_scm_list (void)
   }
 }
 
-int
-main (int argc, char **argv)
+static void
+tests (void *data, int argc, char **argv)
 {
-  scm_init_guile();
   test_scm_list ();
+}
+
+int
+main (int argc, char *argv[])
+{
+  scm_boot_guile (argc, argv, tests, NULL);
   return 0;
 }

test-suite/standalone/test-num2integral.c

@@ -141,12 +141,17 @@ test_ulong_long ()
 #endif /* SCM_SIZEOF_LONG_LONG != 0 */
 }
 
+static void
+tests (void *data, int argc, char **argv)
+{
+  test_long_long ();
+  test_ulong_long ();
+}
+
 int
 main (int argc, char *argv[])
 {
-  scm_init_guile();
-  test_long_long ();
-  test_ulong_long ();
+  scm_boot_guile (argc, argv, tests, NULL);
   return 0;
 }
 

test-suite/standalone/test-round.c

@@ -113,10 +113,15 @@ test_scm_c_round ()
     }
 }
 
+static void
+tests (void *data, int argc, char **argv)
+{
+  test_scm_c_round ();
+}
+
 int
 main (int argc, char *argv[])
 {
-  scm_init_guile();
-  test_scm_c_round ();
+  scm_boot_guile (argc, argv, tests, NULL);
   return 0;
 }