Moved rba and pya unit tests to module.

src/klayout.pri

@@ -1,31 +1,35 @@
 
-ANT_INC = $$PWD/ant/ant
-BD_INC = $$PWD/buddies/src/bd
+TL_INC = $$PWD/tl/tl
 DB_INC = $$PWD/db/db
 DRC_INC = $$PWD/drc/drc
 EDT_INC = $$PWD/edt/edt
 EXT_INC = $$PWD/ext/ext
 GSI_INC = $$PWD/gsi/gsi
-GSI_TEST_INC = $$PWD/gsi/gsi_test
-GSIQT_INC = $$PWD/gsiqt
+ANT_INC = $$PWD/ant/ant
 IMG_INC = $$PWD/img
 LIB_INC = $$PWD/lib
 LAY_INC = $$PWD/lay
 LAYBASIC_INC = $$PWD/laybasic
 LYM_INC = $$PWD/lym
 RDB_INC = $$PWD/rdb
-TL_INC = $$PWD/tl/tl
+
+GSIQT_INC = $$PWD/gsiqt
+
+GSI_TEST_INC = $$PWD/gsi/gsi_test
 UT_INC = $$PWD/ut
+
+BD_INC = $$PWD/buddies/src/bd
+
 VERSION_INC = $$PWD/version
 
 equals(HAVE_RUBY, "1") {
-  RBA_INC = $$PWD/rba
+  RBA_INC = $$PWD/rba/rba
 } else {
   RBA_INC = $$PWD/rbastub
 }
 
 equals(HAVE_PYTHON, "1") {
-  PYA_INC = $$PWD/pya
+  PYA_INC = $$PWD/pya/pya
 } else {
   PYA_INC = $$PWD/pyastub
 }

src/pya/pya.pro

@@ -1,38 +1,6 @@
 
-DESTDIR = $$OUT_PWD/..
-TARGET = klayout_pya
+TEMPLATE = subdirs
+SUBDIRS = pya unit_tests
 
-include($$PWD/../lib.pri)
-
-DEFINES += MAKE_PYA_LIBRARY
-
-SOURCES = \
-  pya.cc \
-  pyaConvert.cc \
-  pyaHelpers.cc \
-  pyaInspector.cc \
-  pyaMarshal.cc \
-  pyaObject.cc \
-  pyaRefs.cc \
-  pyaUtils.cc \
-
-INCLUDEPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC
-DEPENDPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC
-LIBS += $$PYTHONLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi
-
-# Python is somewhat sloppy and relies on the compiler initializing fields 
-# of strucs to 0:
-QMAKE_CXXFLAGS_WARN_ON += \
-    -Wno-missing-field-initializers
-
-HEADERS += \
-    pya.h \
-    pyaCommon.h \
-    pyaConvert.h \
-    pyaHelpers.h \
-    pyaInspector.h \
-    pyaMarshal.h \
-    pyaObject.h \
-    pyaRefs.h \
-    pyaUtils.h
+unit_tests.depends += pya
 

src/pya/pya/pya.pro

@@ -0,0 +1,38 @@
+
+DESTDIR = $$OUT_PWD/../..
+TARGET = klayout_pya
+
+include($$PWD/../../lib.pri)
+
+DEFINES += MAKE_PYA_LIBRARY
+
+SOURCES = \
+  pya.cc \
+  pyaConvert.cc \
+  pyaHelpers.cc \
+  pyaInspector.cc \
+  pyaMarshal.cc \
+  pyaObject.cc \
+  pyaRefs.cc \
+  pyaUtils.cc \
+
+HEADERS += \
+  pya.h \
+  pyaCommon.h \
+  pyaConvert.h \
+  pyaHelpers.h \
+  pyaInspector.h \
+  pyaMarshal.h \
+  pyaObject.h \
+  pyaRefs.h \
+  pyaUtils.h
+
+INCLUDEPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC
+DEPENDPATH += $$PYTHONINCLUDE $$TL_INC $$GSI_INC
+LIBS += $$PYTHONLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi
+
+# Python is somewhat sloppy and relies on the compiler initializing fields 
+# of strucs to 0:
+QMAKE_CXXFLAGS_WARN_ON += \
+    -Wno-missing-field-initializers
+

src/pya/unit_tests/unit_tests.pro

@@ -0,0 +1,16 @@
+
+DESTDIR_UT = $$OUT_PWD/../..
+DESTDIR = $$OUT_PWD/..
+
+TARGET = pya_tests
+
+include($$PWD/../../lib_ut.pri)
+
+SOURCES = \
+  pya.cc
+
+INCLUDEPATH += $$GSI_TEST_INC $$PYA_INC $$DB_INC $$TL_INC $$GSI_INC $$UT_INC
+DEPENDPATH += $$GSI_TEST_INC $$PYA_INC $$DB_INC $$TL_INC $$GSI_INC $$UT_INC
+
+LIBS += -L$$DESTDIR_UT -lgsi_test -lklayout_db -lklayout_tl -lklayout_gsi -lklayout_ut
+

src/rba/rba.pro

@@ -1,29 +1,6 @@
 
-DESTDIR = $$OUT_PWD/..
-TARGET = klayout_rba
+TEMPLATE = subdirs
+SUBDIRS = rba unit_tests
 
-include($$PWD/../lib.pri)
+unit_tests.depends += rba
 
-DEFINES += MAKE_RBA_LIBRARY
-
-SOURCES = rba.cc \
-    rbaConvert.cc \
-    rbaInspector.cc \
-    rbaUtils.cc \
-    rbaInternal.cc \
-    rbaMarshal.cc
-
-# NOTE: ../common needs to be before RUBYINCLUDE since there is a config.h too.
-INCLUDEPATH += ../common $$RUBYINCLUDE $$RUBYINCLUDE2 $$TL_INC $$GSI_INC
-DEPENDPATH += ../common $$RUBYINCLUDE $$RUBYINCLUDE2 $$TL_INC $$GSI_INC
-LIBS += $$RUBYLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi
-  
-
-HEADERS += \
-    rbaConvert.h \
-    rbaInspector.h \
-    rbaUtils.h \
-    rba.h \
-    rbaMarshal.h \
-    rbaInternal.h \
-    rbaCommon.h

src/rba/rba/rba.pro

@@ -0,0 +1,29 @@
+
+DESTDIR = $$OUT_PWD/../..
+TARGET = klayout_rba
+
+include($$PWD/../../lib.pri)
+
+DEFINES += MAKE_RBA_LIBRARY
+
+SOURCES = rba.cc \
+    rbaConvert.cc \
+    rbaInspector.cc \
+    rbaUtils.cc \
+    rbaInternal.cc \
+    rbaMarshal.cc
+
+HEADERS += \
+    rbaConvert.h \
+    rbaInspector.h \
+    rbaUtils.h \
+    rba.h \
+    rbaMarshal.h \
+    rbaInternal.h \
+    rbaCommon.h
+
+# NOTE: ../common needs to be before RUBYINCLUDE since there is a config.h too.
+INCLUDEPATH += ../common $$RUBYINCLUDE $$RUBYINCLUDE2 $$TL_INC $$GSI_INC
+DEPENDPATH += ../common $$RUBYINCLUDE $$RUBYINCLUDE2 $$TL_INC $$GSI_INC
+LIBS += $$RUBYLIBFILE -L$$DESTDIR -lklayout_tl -lklayout_gsi
+  

src/rba/unit_tests/unit_tests.pro

@@ -0,0 +1,16 @@
+
+DESTDIR_UT = $$OUT_PWD/../..
+DESTDIR = $$OUT_PWD/..
+
+TARGET = rba_tests
+
+include($$PWD/../../lib_ut.pri)
+
+SOURCES = \
+  rba.cc
+
+INCLUDEPATH += $$GSI_TEST_INC $$RBA_INC $$TL_INC $$DB_INC $$GSI_INC $$UT_INC
+DEPENDPATH += $$GSI_TEST_INC $$RBA_INC $$TL_INC $$DB_INC $$GSI_INC $$UT_INC
+
+LIBS += -L$$DESTDIR_UT -lgsi_test -lklayout_tl -lklayout_db -lklayout_gsi -lklayout_ut
+

src/unit_tests/unit_tests.pro

@@ -18,8 +18,6 @@ SOURCES = \
   layRenderer.cc \
   laySalt.cc \
   laySnap.cc \
-  pya.cc \
-  rba.cc \
   rdb.cc \
 
 # main components:
@@ -32,8 +30,3 @@ equals(HAVE_QT5, "1") {
   CONFIG += qtestlib
 }
 
-# TODO: remove later
-INCLUDEPATH += $$GSI_TEST_INC
-DEPENDPATH += $$GSI_TEST_INC
-LIBS += -L$$DESTDIR -lgsi_test
-