send a slightly more useful message if a control protocol's probe() method fails

[ardour.git] / libs / ardour / test / test_needing_session.cc

diff --git a/libs/ardour/test/test_needing_session.cc b/libs/ardour/test/test_needing_session.cc
index a6220ded1230ff964f8c534277ac5077b13510f3..d1ce25417b9ca923245dbfb1af2128add7241ea3 100644 (file)
--- a/libs/ardour/test/test_needing_session.cc
+++ b/libs/ardour/test/test_needing_session.cc
@@ -1,4 +1,5 @@
-#include "midi++/manager.h"
+#include <glibmm/miscutils.h>
+
 #include "pbd/compose.h"
 #include "pbd/enumwriter.h"
 #include "ardour/session.h"
@@ -13,18 +14,16 @@ using namespace PBD;
 void
 TestNeedingSession::setUp ()
 {
-       string const test_session_path = "libs/ardour/test/test_session";
-       system (string_compose ("rm -rf %1", test_session_path).c_str());
-       _session = load_session (test_session_path, "test_session");
+       const string session_name("test_session");
+       std::string new_session_dir = Glib::build_filename (new_test_output_dir(), session_name);
+       create_and_start_dummy_backend ();
+       _session = load_session (new_session_dir, "test_session");
 }
 
 void
 TestNeedingSession::tearDown ()
 {
-       AudioEngine::instance()->remove_session ();
        delete _session;
-       AudioEngine::instance()->stop (true);
-       
-       MIDI::Manager::destroy ();
-       AudioEngine::destroy ();
+       stop_and_destroy_backend ();
+       _session = 0;
 }