luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into buddies

This commit is contained in:
Matthias Koefferlein 2017-08-21 00:22:57 +02:00
parent 9585922659 639eef069c
commit 97412b1adb
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lay/laySalt.cc
View File

@ -366,7 +366,7 @@ public:
bool
Salt::create_grain (const SaltGrain &templ, SaltGrain &target)
{
tl_assert (!m_root.is_empty ());
tl_assert (m_root.begin_collections () != m_root.end_collections ());
const SaltGrains *coll = m_root.begin_collections ().operator-> ();
@ -407,8 +407,8 @@ Salt::create_grain (const SaltGrain &templ, SaltGrain &target)
if (subdir.exists () && ! subdir.isDir ()) {
throw tl::Exception (tl::to_string (tr ("Unable to create target directory '%1' for installing package - is already a file").arg (subdir.path ())));
} else if (! subdir.exists ()) {
if (! target_dir.mkdir (tl::to_qstring (*n))) {
throw tl::Exception (tl::to_string (tr ("Unable to create target directory '%1' for installing package").arg (subdir.path ())));
if (! target_dir.mkpath (tl::to_qstring (*n))) {
throw tl::Exception (tl::to_string (tr ("Unable to create target directory '%1' for installing package").arg (subdir.filePath ())));
}
if (! target_dir.cd (tl::to_qstring (*n))) {
throw tl::Exception (tl::to_string (tr ("Unable to change to target directory '%1' for installing package").arg (subdir.path ())));

2
src/lay/laySaltManagerDialog.cc
View File

@ -454,7 +454,7 @@ SaltManagerDialog::update_apply_state ()
apply_new_button->setEnabled (marked > 0);
if (marked == 0) {
apply_label_new->setText (QString ());
apply_label_new->setText (tr ("Select at least one package for installation (check button)"));
} else if (marked == 1) {
apply_label_new->setText (tr ("One package selected"));
} else if (marked > 1) {

4
src/unit_tests/dbCIFReader.cc
View File

@ -128,12 +128,12 @@ static void run_test (ut::TestBase *_this, const char *file, const char *file_au
reader.read (layout_au);
}
bool equal = db::compare_layouts (layout2, layout_au, db::layout_diff::f_boxes_as_polygons | db::layout_diff::f_verbose | db::layout_diff::f_flatten_array_insts, 0);
bool equal = db::compare_layouts (layout2, layout_au, db::layout_diff::f_boxes_as_polygons | db::layout_diff::f_verbose | db::layout_diff::f_flatten_array_insts, 1);
if (! equal) {
_this->raise (tl::sprintf ("Compare failed after reading - see %s vs %s\n", tmp_gds_file, file_au));
}
equal = db::compare_layouts (layout, layout2_cif, db::layout_diff::f_boxes_as_polygons | db::layout_diff::f_verbose | db::layout_diff::f_flatten_array_insts, 0);
equal = db::compare_layouts (layout, layout2_cif, db::layout_diff::f_boxes_as_polygons | db::layout_diff::f_verbose | db::layout_diff::f_flatten_array_insts, 1);
if (! equal) {
_this->raise (tl::sprintf ("Compare failed after writing - see %s vs %s\n", file, tmp_cif_file));
}

2
src/unit_tests/dbDXFReader.cc
View File

@ -67,7 +67,7 @@ static void run_test (ut::TestBase *_this, const char *file, const char *file_au
reader.read (layout, options);
}
_this->compare_layouts (layout, ut::testsrc_private () + std::string ("/testdata/dxf/") + file_au);
_this->compare_layouts (layout, ut::testsrc_private () + std::string ("/testdata/dxf/") + file_au, ut::WriteGDS2, 1);
}
TEST(1a)

2
src/unit_tests/extGerberImport.cc
View File

@ -47,7 +47,7 @@ static void run_test (ut::TestBase *_this, const char *dir)
reader.read (layout, options);
}
_this->compare_layouts (layout, ut::testsrc_private () + "/testdata/pcb/" + dir + "/au.oas.gz", ut::WriteOAS);
_this->compare_layouts (layout, ut::testsrc_private () + "/testdata/pcb/" + dir + "/au.oas.gz", ut::WriteOAS, 1);
}
TEST(1)

6
src/ut/utMain.cc
View File

@ -879,13 +879,15 @@ main_cont (int argc, char **argv)
// there is no "dlopen" on mingw, so we need to emulate it.
HINSTANCE handle = LoadLibraryW ((const wchar_t *) tl::to_qstring (pp).constData ());
if (! handle) {
throw tl::Exception (tl::to_string (QObject::tr ("Unable to load plugin tests: %s with error message: %s ")), pp, GetLastError ());
std::cerr << tl::sprintf ("Unable to load plugin tests: %s with error message: %s", pp.c_str (), GetLastError ()) << std::endl;
exit (1);
}
#else
void *handle;
handle = dlopen (tl::string_to_system (pp).c_str (), RTLD_LAZY);
if (! handle) {
throw tl::Exception (tl::to_string (QObject::tr ("Unable to load plugin tests: %s")), pp);
std::cerr << tl::sprintf ("Unable to load plugin tests: %s", pp.c_str ()) << std::endl;
exit (1);
}
#endif