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 drc-enhancements

This commit is contained in:
Matthias Koefferlein 2021-02-28 23:31:14 +01:00
parent 8c6b231ae6 2a9564856b
commit 6f8e981504
3 changed files with 28 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/pymod/pymod.pro
View File

@ -13,6 +13,7 @@ SUBDIRS = \
SUBDIRS += lay
equals(HAVE_QTBINDINGS, "1") {
equals(HAVE_QT5, "1") {
SUBDIRS += \
@ -39,11 +40,12 @@ SUBDIRS = \
QtDesigner
}
}
}
equals(HAVE_QT_UITOOLS, "1") {
SUBDIRS += QtUiTools
equals(HAVE_QT_UITOOLS, "1") {
SUBDIRS += QtUiTools
}
}
}
ALL_DIRS = $$SUBDIRS

25
testdata/python/basic.py vendored
View File

@ -1188,6 +1188,9 @@ class BasicTest(unittest.TestCase):
# test client data binding to C++ objects
b = pya.B()
longint = 10000000000000000
longint_as_int = (sys.maxsize > 5000000000 or (str(longint) == "10000000000000000" and type(longint) is int))
self.assertEqual( b.b20a( 5.0 ), False )
self.assertEqual( b.b20a( None ), True )
@ -1195,27 +1198,27 @@ class BasicTest(unittest.TestCase):
self.assertEqual( b.b20a( "hallo" ), False )
self.assertEqual( b.b20a( False ), False )
self.assertEqual( b.b20a( True ), False )
self.assertEqual( b.b20a( 10000000000000000 ), False )
self.assertEqual( b.b20a( longint ), False )
self.assertEqual( b.b20b( 5.0 ), True )
self.assertEqual( b.b20b( None ), False )
self.assertEqual( b.b20b( 1 ), False )
self.assertEqual( b.b20b( "hallo" ), False )
self.assertEqual( b.b20b( False ), False )
self.assertEqual( b.b20b( True ), False )
if sys.maxsize > 5000000000:
# on 64 bit platforms this fits into a long value, therefore this test returns false:
self.assertEqual( b.b20b( 10000000000000000 ), False )
if longint_as_int:
# this fits into a long value, therefore this test returns false:
self.assertEqual( b.b20b( longint ), False )
else:
# otherwise it is converted to a double:
self.assertEqual( b.b20b( 10000000000000000 ), True )
self.assertEqual( b.b20b( longint ), True )
self.assertEqual( b.b20c( 5.0 ), False )
self.assertEqual( b.b20c( None ), False )
if sys.maxsize > 5000000000:
# on 64 bit platforms this fits into a long value, therefore this test returns True:
self.assertEqual( b.b20c( 10000000000000000 ), True )
if longint_as_int:
# this fits into a long value, therefore this test returns false:
self.assertEqual( b.b20c( longint ), True )
else:
# otherwise it is converted to a double and the test returns false:
self.assertEqual( b.b20c( 10000000000000000 ), False )
self.assertEqual( b.b20c( longint ), False )
self.assertEqual( b.b20c( "hallo" ), False )
self.assertEqual( b.b20c( False ), False )
self.assertEqual( b.b20c( True ), False )
@ -1225,14 +1228,14 @@ class BasicTest(unittest.TestCase):
self.assertEqual( b.b20d( "hallo" ), True )
self.assertEqual( b.b20d( False ), False )
self.assertEqual( b.b20d( True ), False )
self.assertEqual( b.b20d( 10000000000000000 ), False )
self.assertEqual( b.b20d( longint ), False )
self.assertEqual( b.b20e( 5.0 ), False )
self.assertEqual( b.b20e( None ), False )
self.assertEqual( b.b20e( 1 ), False )
self.assertEqual( b.b20e( "hallo" ), False )
self.assertEqual( b.b20e( False ), True )
self.assertEqual( b.b20e( True ), True )
self.assertEqual( b.b20e( 10000000000000000 ), False )
self.assertEqual( b.b20e( longint ), False )
self.assertEqual( b.b21a( 50 ), "50" )
self.assertEqual( b.b21a( True ), "true" )

9
testdata/ruby/basic_testcore.rb vendored
View File

@ -27,6 +27,7 @@ class Basic_TestClass < TestBase
a = nil
GC.start
GC.start
assert_equal( RBA::A::instance_count, ic0 )
a = RBA::A.new
@ -2737,13 +2738,16 @@ class Basic_TestClass < TestBase
GC.start
nx = RBA::X::instances
z = RBA::Z::new
nx = RBA::X::instances
x = RBA::X::new("1")
z.set_x(x)
assert_equal(RBA::X::instances, nx + 1)
# weird. On WIN/32bit, this makes the test pass (enables GC somehow?):
puts("ANYTHING")
x = nil
z.set_x(nil)
GC.start
@ -2759,6 +2763,9 @@ class Basic_TestClass < TestBase
assert_equal(RBA::X::instances, nx + 1)
# weird. On WIN/32bit, this makes the test pass (enables GC somehow?):
puts("ANYTHING")
# this will release the object - hence it's going to be deleted
z.set_x_keep(nil)
GC.start