13
0

Use PBD::tmp_writable_directory in libardour test_util.cc

This commit is contained in:
Tim Mayberry 2014-11-29 14:55:58 +07:00
parent 376340a29f
commit 929fc3d235
2 changed files with 3 additions and 12 deletions

View File

@ -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

View File

@ -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(