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

WIP: fixed unit test fails with python module import tests - what a hack ...

This commit is contained in:
Matthias Koefferlein 2018-06-20 23:19:26 +02:00
parent 087740d326
commit 0d6da0e49d
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/pymod/unit_tests/pymod_tests.cc
View File

@ -20,6 +20,13 @@
*/ */
// Oh my god ... STRINGIFY(s) will get the argument with MACROS REPLACED.
// So if the PYTHONPATH is something like build.linux-released, the "linux" macro
// set to 1 will make this "build.1-release". So STRINGIFY isn't a real solution.
// On the other hand that is the only documented way to turn a macro into a string.
// This will prevent that issue:
#undef linux
#define STRINGIFY(s) _STRINGIFY(s) #define STRINGIFY(s) _STRINGIFY(s)
#define _STRINGIFY(s) #s #define _STRINGIFY(s) #s
@ -41,7 +48,7 @@ int run_pymodtest (tl::TestBase * /*_this*/, const std::string &fn)
args << tl::to_qstring (fp); args << tl::to_qstring (fp);
QProcessEnvironment env = QProcessEnvironment::systemEnvironment (); QProcessEnvironment env = QProcessEnvironment::systemEnvironment ();
env.insert("PYTHONPATH", STRINGIFY(PYTHONPATH)); env.insert("PYTHONPATH", STRINGIFY (PYTHONPATH));
process.setProcessEnvironment(env); process.setProcessEnvironment(env);
process.start (tl::to_qstring (STRINGIFY (PYTHON)), args); process.start (tl::to_qstring (STRINGIFY (PYTHON)), args);