diff --git a/libs/pbd/test/filesystem_test.cc b/libs/pbd/test/filesystem_test.cc index 7326b99522..2e59056310 100644 --- a/libs/pbd/test/filesystem_test.cc +++ b/libs/pbd/test/filesystem_test.cc @@ -392,8 +392,6 @@ FilesystemTest::testCanonicalPathUTF8 () get_utf8_test_strings (utf8_strings); - bool conversion_failed = false; - for (std::vector::const_iterator i = utf8_strings.begin (); i != utf8_strings.end (); ++i) { @@ -403,25 +401,12 @@ FilesystemTest::testCanonicalPathUTF8 () string relative_path = Glib::build_filename (".", *i); - // PBD::canonical_path can throw if Glib::locale_from_utf8 fails - try { - - string canonical_path = PBD::canonical_path (relative_path); - - cerr << "PBD::canonical_path succeeded for path: " << canonical_path << endl; - // If successful check that it resolved to the absolute path - CPPUNIT_ASSERT (absolute_path == canonical_path); - - } catch (const Glib::ConvertError& err) { - cerr << "Character set conversion failed: " << err.what () << endl; - cerr << "PBD::canonical_path failed for path containing string: " << *i << endl; - conversion_failed = true; - } + string canonical_path = PBD::canonical_path (relative_path); + // Check that it resolved to the absolute path + CPPUNIT_ASSERT (absolute_path == canonical_path); } - CPPUNIT_ASSERT (conversion_failed != true); - #endif }