From f6e15a3b6bfdfc4ceb6e3d4f2c97dc2b7009a13a Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Sat, 29 Nov 2014 16:11:22 +0700 Subject: Use PBD::tmp_writable_directory to write evoral test file into no need to remove directory as it is temporary --- libs/evoral/test/SMFTest.cpp | 15 +++++++++------ libs/evoral/wscript | 1 + 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'libs') diff --git a/libs/evoral/test/SMFTest.cpp b/libs/evoral/test/SMFTest.cpp index cf34a17ba3..3c82b14f95 100644 --- a/libs/evoral/test/SMFTest.cpp +++ b/libs/evoral/test/SMFTest.cpp @@ -1,8 +1,9 @@ #include "SMFTest.hpp" -#ifdef WIN32 -#include // for R_OK -#endif +#include +#include + +#include "pbd/file_utils.h" using namespace std; @@ -12,10 +13,12 @@ void SMFTest::createNewFileTest () { TestSMF smf; - smf.create("NewFile.mid"); + + string output_dir_path = PBD::tmp_writable_directory (PACKAGE, "createNewFileTest"); + string new_file_path = Glib::build_filename (output_dir_path, "NewFile.mid"); + smf.create(new_file_path); smf.close(); - CPPUNIT_ASSERT(access("NewFile.mid", R_OK) == 0); - unlink(smf.path().c_str()); + CPPUNIT_ASSERT(Glib::file_test (new_file_path, Glib::FILE_TEST_IS_REGULAR)); } void diff --git a/libs/evoral/wscript b/libs/evoral/wscript index 10deb2ebb8..4b798f504d 100644 --- a/libs/evoral/wscript +++ b/libs/evoral/wscript @@ -145,6 +145,7 @@ def build(bld): obj.target = 'run-tests' obj.name = 'libevoral-tests' obj.install_path = '' + obj.defines = ['PACKAGE="libevoraltest"'] if bld.env['TEST_COVERAGE']: obj.linkflags = '-lgcov' obj.cflags = [ '-fprofile-arcs', '-ftest-coverage' ] -- cgit v1.2.3