[beast: 6/15] BSE: use Bse::Test

[Tim Janik <timj src gnome org>]

commit b4450dfb47b3f7e04de50b137073bcb56856ba42
Author: Tim Janik <timj gnu org>
Date:   Tue Jul 18 02:56:52 2017 +0200

    BSE: use Bse::Test
    
    Signed-off-by: Tim Janik <timj gnu org>

 bse/bsemain.cc              |    5 ++---
 bse/tests/blocktests.cc     |    4 ++--
 bse/tests/filtertest.cc     |    2 +-
 bse/tests/firhandle.cc      |    2 +-
 bse/tests/loophandle.cc     |    2 +-
 bse/tests/misctests.cc      |    2 +-
 bse/tests/resamplehandle.cc |    4 ++--
 bse/tests/subnormals.cc     |    2 +-
 bse/tests/testfft.cc        |    2 +-
 9 files changed, 12 insertions(+), 13 deletions(-)
---
diff --git a/bse/bsemain.cc b/bse/bsemain.cc
index 43c5dc9..77e4b63 100644
--- a/bse/bsemain.cc
+++ b/bse/bsemain.cc
@@ -17,10 +17,9 @@
 #include <stdlib.h>
 #include <sys/types.h>
 #include <unistd.h>
-#include <sfi/sfitests.hh> /* sfti_test_init() */
+#include <sfi/testing.hh>
 
 using namespace Bse;
-namespace Test = Bse::Test;
 
 /* --- prototypes --- */
 static void    init_parse_args (int *argc_p, char **argv_p, BseMainArgs *margs, const Bse::StringVector 
&args);
@@ -200,7 +199,7 @@ initialize_with_argv (int *argc, char **argv, const char *app_name, const Bse::S
 
   // initialize SFI
   if (initialized_for_unit_testing > 0)
-    sfi_init_test (argc, argv);
+    Bse::Test::init (argc, argv);
   else
     sfi_init (argc, argv);
 }
diff --git a/bse/tests/blocktests.cc b/bse/tests/blocktests.cc
index a0a51f8..cf2f4b4 100644
--- a/bse/tests/blocktests.cc
+++ b/bse/tests/blocktests.cc
@@ -1,6 +1,6 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #include <bse/bseblockutils.hh>
-#include <sfi/sfitests.hh>
+#include <sfi/testing.hh>
 #include <bse/bsemain.hh>
 
 using namespace Bse;
@@ -407,7 +407,7 @@ main (int   argc,
       char *argv[])
 {
   // usually we'd call bse_init_test() here, but we have tests to run before plugins are loaded
-  Rapicorn::init_core_test (RAPICORN_PRETTY_FILE, &argc, argv);
+  Bse::Test::init (&argc, argv);
   Bse::StringVector sv = Bse::string_split (Bse::cpu_info(), " ");
   Bse::String machine = sv.size() >= 2 ? sv[1] : "Unknown";
   printout ("  NOTE     Running on: %s+%s\n", machine.c_str(), bse_block_impl_name()); // usually done by 
bse_init_test
diff --git a/bse/tests/filtertest.cc b/bse/tests/filtertest.cc
index 9a738e2..a56fc8e 100644
--- a/bse/tests/filtertest.cc
+++ b/bse/tests/filtertest.cc
@@ -1,7 +1,7 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #include <bse/bsedefs.hh>
 // #define TEST_VERBOSE
-#include <sfi/sfitests.hh>
+#include <sfi/testing.hh>
 #include <bse/bsefilter.hh>
 #include <bse/bsemain.hh>
 #include <bse/gslfilter.hh> // FIXME
diff --git a/bse/tests/firhandle.cc b/bse/tests/firhandle.cc
index 76c26c4..937d2b7 100644
--- a/bse/tests/firhandle.cc
+++ b/bse/tests/firhandle.cc
@@ -1,7 +1,7 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #include <bse/bsedefs.hh>
 // #define TEST_VERBOSE
-#include <sfi/sfitests.hh>
+#include <sfi/testing.hh>
 #include <bse/gsldatahandle.hh>
 #include <bse/gsldatautils.hh>
 #include <bse/bsemain.hh>
diff --git a/bse/tests/loophandle.cc b/bse/tests/loophandle.cc
index a030608..7c80adc 100644
--- a/bse/tests/loophandle.cc
+++ b/bse/tests/loophandle.cc
@@ -1,5 +1,5 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
-#include <sfi/sfitests.hh>
+#include <sfi/testing.hh>
 #include <bse/gsldatahandle.hh>
 #include <bse/gsldatautils.hh>
 #include <bse/bse.hh>
diff --git a/bse/tests/misctests.cc b/bse/tests/misctests.cc
index ad07b35..cc760cb 100644
--- a/bse/tests/misctests.cc
+++ b/bse/tests/misctests.cc
@@ -1,7 +1,7 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #include <bse/bsemain.hh>
 // #define TEST_VERBOSE
-#include <sfi/sfitests.hh>
+#include <sfi/testing.hh>
 #include <bse/bsemathsignal.hh>
 #include <bse/bsecxxplugin.hh> // for generated types
 
diff --git a/bse/tests/resamplehandle.cc b/bse/tests/resamplehandle.cc
index 3a52ad0..658f9a6 100644
--- a/bse/tests/resamplehandle.cc
+++ b/bse/tests/resamplehandle.cc
@@ -1,7 +1,7 @@
 // Licensed GNU LGPL v2.1 or later: http://www.gnu.org/licenses/lgpl.html
 #include <bse/bsemathsignal.hh>
 #include <bse/bsemain.hh>
-#include <sfi/sfitests.hh>
+#include <sfi/testing.hh>
 #include <bse/gsldatautils.hh>
 #include <bse/bseblockutils.hh>
 #include <stdlib.h>
@@ -457,7 +457,7 @@ main (int   argc,
       char *argv[])
 {
   // usually we'd call bse_init_test() here, but we have tests to rnu before plugins are loaded
-  Rapicorn::init_core_test (RAPICORN_PRETTY_FILE, &argc, argv);
+  Bse::Test::init (&argc, argv);
   Bse::StringVector sv = Bse::string_split (Bse::cpu_info(), " ");
   Bse::String machine = sv.size() >= 2 ? sv[1] : "Unknown";
   printout ("  NOTE     Running on: %s+%s", machine.c_str(), bse_block_impl_name()); // usually done by 
bse_init_test
diff --git a/bse/tests/subnormals.cc b/bse/tests/subnormals.cc
index 77e5841..37f599c 100644
--- a/bse/tests/subnormals.cc
+++ b/bse/tests/subnormals.cc
@@ -2,7 +2,7 @@
 #include <bse/bse.hh>
 #include <bse/bseieee754.hh>
 #include <bse/bsemain.hh>
-#include <rapicorn-test.hh>
+#include <sfi/testing.hh>
 #include <stdio.h>
 #ifdef __SSE__
 #include <xmmintrin.h>
diff --git a/bse/tests/testfft.cc b/bse/tests/testfft.cc
index 67d5517..6b465a9 100644
--- a/bse/tests/testfft.cc
+++ b/bse/tests/testfft.cc
@@ -3,7 +3,7 @@
 #include <bse/bsemath.hh>
 #include <bse/bsemain.hh>
 #include <bse/gslfft.hh>
-#include <rapicorn-test.hh>
+#include <sfi/testing.hh>
 #include <sys/time.h>
 #include <stdlib.h>
 #include <string.h>