From 929fc3d235d7df4597e633de372756c40cc5bafc Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 29 Nov 2014 14:55:58 +0700 Subject: Use PBD::tmp_writable_directory in libardour test_util.cc --- libs/ardour/test/test_util.cc | 14 ++------------ libs/ardour/wscript | 1 + 2 files changed, 3 insertions(+), 12 deletions(-) (limited to 'libs/ardour') diff --git a/libs/ardour/test/test_util.cc b/libs/ardour/test/test_util.cc index 768bee7b48..2cd7fb8bde 100644 --- a/libs/ardour/test/test_util.cc +++ b/libs/ardour/test/test_util.cc @@ -24,6 +24,7 @@ #include "pbd/xml++.h" #include "pbd/textreceiver.h" +#include "pbd/file_utils.h" #include "ardour/session.h" #include "ardour/audioengine.h" @@ -177,18 +178,7 @@ test_search_path () std::string new_test_output_dir (std::string prefix) { - std::string tmp_dir = Glib::build_filename (g_get_tmp_dir(), "ardour_test"); - std::string dir_name; - std::string new_test_dir; - do { - ostringstream oss; - oss << prefix; - oss << g_random_int (); - dir_name = oss.str(); - new_test_dir = Glib::build_filename (tmp_dir, dir_name); - if (Glib::file_test (new_test_dir, Glib::FILE_TEST_EXISTS)) continue; - } while (g_mkdir_with_parents (new_test_dir.c_str(), 0755) != 0); - return new_test_dir; + return PBD::tmp_writable_directory (PACKAGE, prefix); } int diff --git a/libs/ardour/wscript b/libs/ardour/wscript index cc8cd6c05e..f8ec4ff507 100644 --- a/libs/ardour/wscript +++ b/libs/ardour/wscript @@ -435,6 +435,7 @@ def build(bld): else: testcommon.use.extend(['libltc', 'librubberband']) testcommon.defines = [ + 'PACKAGE="libardour3test"', 'DATA_DIR="' + os.path.normpath(bld.env['DATADIR']) + '"', 'CONFIG_DIR="' + os.path.normpath(bld.env['SYSCONFDIR']) + '"', 'LOCALEDIR="' + os.path.join( -- cgit v1.2.3