[beast: 5/15] SFI: use Bse::Test, avoid Rapicorn::Test

[Tim Janik <timj src gnome org>]

commit 70e656fe46c9233b94e8246a4f575ba1d2a59090
Author: Tim Janik <timj gnu org>
Date:   Tue Jul 18 02:56:25 2017 +0200

    SFI: use Bse::Test, avoid Rapicorn::Test
    
    Signed-off-by: Tim Janik <timj gnu org>

 sfi/sfiwrapper.cc      |    5 ++---
 sfi/tests/misctests.cc |    4 ++--
 sfi/tests/ring.cc      |    4 ++--
 sfi/tests/testcxx.cc   |    4 ++--
 sfi/tests/testsfidl.cc |    2 +-
 5 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/sfi/sfiwrapper.cc b/sfi/sfiwrapper.cc
index 0314958..4a1e8d2 100644
--- a/sfi/sfiwrapper.cc
+++ b/sfi/sfiwrapper.cc
@@ -2,7 +2,7 @@
 #include "sfiwrapper.hh"
 #include "sficxx.hh"
 #include <sfi/sfi.hh>
-#include <rapicorn-test.hh>
+#include <sfi/testing.hh>
 #include <errno.h>
 
 /* --- initialization --- */
@@ -12,9 +12,8 @@ sfi_init (int *argcp, char **argv, const Bse::StringVector &args)
   static bool initialized = false;
   if (initialized)
     return;
-  char *prg_name = argcp && *argcp ? g_path_get_basename (argv[0]) : NULL;
   if (args.size() == 1 && args[0] == "rapicorn-test-initialization=1")
-    Rapicorn::init_core_test (prg_name, argcp, argv);
+    Bse::Test::init (argcp, argv);
   else
     Rapicorn::parse_init_args (argcp, argv);
 
diff --git a/sfi/tests/misctests.cc b/sfi/tests/misctests.cc
index 6e4bf4c..12dea49 100644
--- a/sfi/tests/misctests.cc
+++ b/sfi/tests/misctests.cc
@@ -2,7 +2,7 @@
 #undef G_LOG_DOMAIN
 #define  G_LOG_DOMAIN __FILE__
 // #define TEST_VERBOSE
-#include <sfi/sfitests.hh>
+#include <sfi/testing.hh>
 #include <sfi/path.hh>
 #include <unistd.h>
 #include <string.h>
@@ -893,7 +893,7 @@ main (int   argc,
       qsort (dummy_array, 3, 1, my_compare_func);
     }
 
-  sfi_init_test (&argc, argv);
+  Bse::Test::init (&argc, argv);
 
   test_types_init ();
 
diff --git a/sfi/tests/ring.cc b/sfi/tests/ring.cc
index 494aa4d..beb1757 100644
--- a/sfi/tests/ring.cc
+++ b/sfi/tests/ring.cc
@@ -1,6 +1,6 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 // #define TEST_VERBOSE
-#include <sfi/sfitests.hh>
+#include <sfi/testing.hh>
 #include <sfi/sfi.hh>
 
 using namespace Bse;
@@ -204,7 +204,7 @@ int
 main (int   argc,
       char *argv[])
 {
-  sfi_init_test (&argc, argv);
+  Bse::Test::init (&argc, argv);
   test_sfi_ring();
   return 0;
 }
diff --git a/sfi/tests/testcxx.cc b/sfi/tests/testcxx.cc
index e73c1da..5413630 100644
--- a/sfi/tests/testcxx.cc
+++ b/sfi/tests/testcxx.cc
@@ -1,7 +1,7 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #undef G_LOG_DOMAIN
 #define  G_LOG_DOMAIN __FILE__
-#include <sfi/sfitests.hh>
+#include <sfi/testing.hh>
 #include "../sficxx.hh"
 #include <stdio.h>
 
@@ -23,7 +23,7 @@ int
 main (int   argc,
       char *argv[])
 {
-  sfi_init_test (&argc, argv);
+  Bse::Test::init (&argc, argv);
 
   TSTART ("Test SfiString");
   TASSERT (sizeof (SfiString) == sizeof (const char*));
diff --git a/sfi/tests/testsfidl.cc b/sfi/tests/testsfidl.cc
index 7db8d8d..cff4f46 100644
--- a/sfi/tests/testsfidl.cc
+++ b/sfi/tests/testsfidl.cc
@@ -1,7 +1,7 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #undef G_LOG_DOMAIN
 #define  G_LOG_DOMAIN __FILE__
-#include <sfi/sfitests.hh>
+#include <sfi/testing.hh>
 #include "../sfidl-generator.hh"
 #include "../sfidl-factory.hh"
 #include <stdio.h>