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

Fixed ut_runner 

- Implict macros were not disabled as they should
- This revealed that DRC scripts could not run with -rx
This commit is contained in:
Matthias Koefferlein 2017-11-01 18:20:45 +01:00
parent 5d9513b6a5
commit ea5920bda4
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/lay/lay/layMacroController.cc
View File

@ -85,10 +85,8 @@ MacroController::finish (bool load)
// Scan built-in macros
// These macros are always taken, even if there are no macros requested (they are required to
// fully form the API).
if (load) {
lym::MacroCollection::root ().add_folder (tl::to_string (QObject::tr ("Built-In")), ":/built-in-macros", "macros", true);
lym::MacroCollection::root ().add_folder (tl::to_string (QObject::tr ("Built-In")), ":/built-in-pymacros", "pymacros", true);
}
lym::MacroCollection::root ().add_folder (tl::to_string (QObject::tr ("Built-In")), ":/built-in-macros", "macros", true);
lym::MacroCollection::root ().add_folder (tl::to_string (QObject::tr ("Built-In")), ":/built-in-pymacros", "pymacros", true);
// TODO: consider adding "drc" dynamically and allow more dynamic categories
// We can do so if we first load the macros with the initial interpreters, then do autorun (which creates DSL interpreters) and then

2
src/unit_tests/unit_test_main.cc
View File

@ -368,12 +368,12 @@ main_cont (int argc, char **argv)
// No side effects
lay::set_klayout_path (std::vector<std::string> ());
int ac = 2;
static char av0[] = "unit_test";
static char av1[] = "-z"; // don't show main window
static char av2[] = "-nc"; // No configuration file
static char av3[] = "-rx"; // No mplicit macros
char *av[] = { av0, av1, av2, av3, 0 };
int ac = sizeof (av) / sizeof (av[0]) - 1;
lay::Application app (ac, av, false);
app.ruby_interpreter ().push_console (&console);