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

Merge remote-tracking branch 'upstream/issue-1565' into 0.28.14-mac1

This commit is contained in:
Kazunari Sekigawa 2023-12-12 21:04:13 +09:00
parent 4df4c195a2 bbd7a9cd8a
commit 0e1706cdbb
4 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/pya/pya/pyaUtils.cc
View File

@ -119,7 +119,9 @@ void check_error ()
int status = 0;
if (exc_value) {
tl::Variant st = python2c<tl::Variant> (exc_value.get ());
status = st.to_int ();
if (st.can_convert_to_int ()) {
status = st.to_int ();
}
}
throw tl::ExitException (status);

8
testdata/klayout_main/main.rb vendored
View File

@ -201,6 +201,14 @@ class KLayoutMain_TestClass < TestBase
out = `#{self.klayout_bin} -z -r #{File.join(File.dirname(__FILE__), "test12.rb")} 2>&1`
assert_equal(out, "Before exit()\n")
# sys.exit(0) - Python
out = `#{self.klayout_bin} -z -r #{File.join(File.dirname(__FILE__), "test12s.py")} 2>&1`
assert_equal(out, "Before exit()\n")
# quit() - Python (issue #1565)
out = `#{self.klayout_bin} -z -r #{File.join(File.dirname(__FILE__), "test12q.py")} 2>&1`
assert_equal(out, "Before quit()\n")
end
end

4
testdata/klayout_main/test12q.py vendored Normal file
View File

@ -0,0 +1,4 @@
print("Before quit()")
quit()

6
testdata/klayout_main/test12s.py vendored Normal file
View File

@ -0,0 +1,6 @@
import sys
print("Before exit()")
sys.exit(1)