From c8f4272ebbddcb106afbd559674ec0e78420b4d0 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sun, 27 Aug 2017 00:47:40 +0200 Subject: [PATCH] Moved rba and pya unit tests to module. --- src/klayout.pri | 18 +++++++++------ src/pya/pya.pro | 38 +++---------------------------- src/pya/{ => pya}/pya.cc | 0 src/pya/{ => pya}/pya.h | 0 src/pya/pya/pya.pro | 38 +++++++++++++++++++++++++++++++ src/pya/{ => pya}/pyaCommon.h | 0 src/pya/{ => pya}/pyaConvert.cc | 0 src/pya/{ => pya}/pyaConvert.h | 0 src/pya/{ => pya}/pyaHelpers.cc | 0 src/pya/{ => pya}/pyaHelpers.h | 0 src/pya/{ => pya}/pyaInspector.cc | 0 src/pya/{ => pya}/pyaInspector.h | 0 src/pya/{ => pya}/pyaMarshal.cc | 0 src/pya/{ => pya}/pyaMarshal.h | 0 src/pya/{ => pya}/pyaObject.cc | 0 src/pya/{ => pya}/pyaObject.h | 0 src/pya/{ => pya}/pyaRefs.cc | 0 src/pya/{ => pya}/pyaRefs.h | 0 src/pya/{ => pya}/pyaUtils.cc | 0 src/pya/{ => pya}/pyaUtils.h | 0 src/{ => pya}/unit_tests/pya.cc | 0 src/pya/unit_tests/unit_tests.pro | 16 +++++++++++++ src/rba/rba.pro | 29 +++-------------------- src/rba/{ => rba}/rba.cc | 0 src/rba/{ => rba}/rba.h | 0 src/rba/rba/rba.pro | 29 +++++++++++++++++++++++ src/rba/{ => rba}/rbaCommon.h | 0 src/rba/{ => rba}/rbaConvert.cc | 0 src/rba/{ => rba}/rbaConvert.h | 0 src/rba/{ => rba}/rbaInspector.cc | 0 src/rba/{ => rba}/rbaInspector.h | 0 src/rba/{ => rba}/rbaInternal.cc | 0 src/rba/{ => rba}/rbaInternal.h | 0 src/rba/{ => rba}/rbaMarshal.cc | 0 src/rba/{ => rba}/rbaMarshal.h | 0 src/rba/{ => rba}/rbaUtils.cc | 0 src/rba/{ => rba}/rbaUtils.h | 0 src/{ => rba}/unit_tests/rba.cc | 0 src/rba/unit_tests/unit_tests.pro | 16 +++++++++++++ src/unit_tests/unit_tests.pro | 7 ------ 40 files changed, 116 insertions(+), 75 deletions(-) rename src/pya/{ => pya}/pya.cc (100%) rename src/pya/{ => pya}/pya.h (100%) create mode 100644 src/pya/pya/pya.pro rename src/pya/{ => pya}/pyaCommon.h (100%) rename src/pya/{ => pya}/pyaConvert.cc (100%) rename src/pya/{ => pya}/pyaConvert.h (100%) rename src/pya/{ => pya}/pyaHelpers.cc (100%) rename src/pya/{ => pya}/pyaHelpers.h (100%) rename src/pya/{ => pya}/pyaInspector.cc (100%) rename src/pya/{ => pya}/pyaInspector.h (100%) rename src/pya/{ => pya}/pyaMarshal.cc (100%) rename src/pya/{ => pya}/pyaMarshal.h (100%) rename src/pya/{ => pya}/pyaObject.cc (100%) rename src/pya/{ => pya}/pyaObject.h (100%) rename src/pya/{ => pya}/pyaRefs.cc (100%) rename src/pya/{ => pya}/pyaRefs.h (100%) rename src/pya/{ => pya}/pyaUtils.cc (100%) rename src/pya/{ => pya}/pyaUtils.h (100%) rename src/{ => pya}/unit_tests/pya.cc (100%) create mode 100644 src/pya/unit_tests/unit_tests.pro rename src/rba/{ => rba}/rba.cc (100%) rename src/rba/{ => rba}/rba.h (100%) create mode 100644 src/rba/rba/rba.pro rename src/rba/{ => rba}/rbaCommon.h (100%) rename src/rba/{ => rba}/rbaConvert.cc (100%) rename src/rba/{ => rba}/rbaConvert.h (100%) rename src/rba/{ => rba}/rbaInspector.cc (100%) rename src/rba/{ => rba}/rbaInspector.h (100%) rename src/rba/{ => rba}/rbaInternal.cc (100%) rename src/rba/{ => rba}/rbaInternal.h (100%) rename src/rba/{ => rba}/rbaMarshal.cc (100%) rename src/rba/{ => rba}/rbaMarshal.h (100%) rename src/rba/{ => rba}/rbaUtils.cc (100%) rename src/rba/{ => rba}/rbaUtils.h (100%) rename src/{ => rba}/unit_tests/rba.cc (100%) create mode 100644 src/rba/unit_tests/unit_tests.pro diff --git a/src/klayout.pri b/src/klayout.pri index e8c1b0a63..f317fe691 100644 --- a/src/klayout.pri +++ b/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 } diff --git a/src/pya/pya.pro b/src/pya/pya.pro index 103c7ac40..05fa2301a 100644 --- a/src/pya/pya.pro +++ b/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 diff --git a/src/pya/pya.cc b/src/pya/pya/pya.cc similarity index 100% rename from src/pya/pya.cc rename to src/pya/pya/pya.cc diff --git a/src/pya/pya.h b/src/pya/pya/pya.h similarity index 100% rename from src/pya/pya.h rename to src/pya/pya/pya.h diff --git a/src/pya/pya/pya.pro b/src/pya/pya/pya.pro new file mode 100644 index 000000000..990e989de --- /dev/null +++ b/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 + diff --git a/src/pya/pyaCommon.h b/src/pya/pya/pyaCommon.h similarity index 100% rename from src/pya/pyaCommon.h rename to src/pya/pya/pyaCommon.h diff --git a/src/pya/pyaConvert.cc b/src/pya/pya/pyaConvert.cc similarity index 100% rename from src/pya/pyaConvert.cc rename to src/pya/pya/pyaConvert.cc diff --git a/src/pya/pyaConvert.h b/src/pya/pya/pyaConvert.h similarity index 100% rename from src/pya/pyaConvert.h rename to src/pya/pya/pyaConvert.h diff --git a/src/pya/pyaHelpers.cc b/src/pya/pya/pyaHelpers.cc similarity index 100% rename from src/pya/pyaHelpers.cc rename to src/pya/pya/pyaHelpers.cc diff --git a/src/pya/pyaHelpers.h b/src/pya/pya/pyaHelpers.h similarity index 100% rename from src/pya/pyaHelpers.h rename to src/pya/pya/pyaHelpers.h diff --git a/src/pya/pyaInspector.cc b/src/pya/pya/pyaInspector.cc similarity index 100% rename from src/pya/pyaInspector.cc rename to src/pya/pya/pyaInspector.cc diff --git a/src/pya/pyaInspector.h b/src/pya/pya/pyaInspector.h similarity index 100% rename from src/pya/pyaInspector.h rename to src/pya/pya/pyaInspector.h diff --git a/src/pya/pyaMarshal.cc b/src/pya/pya/pyaMarshal.cc similarity index 100% rename from src/pya/pyaMarshal.cc rename to src/pya/pya/pyaMarshal.cc diff --git a/src/pya/pyaMarshal.h b/src/pya/pya/pyaMarshal.h similarity index 100% rename from src/pya/pyaMarshal.h rename to src/pya/pya/pyaMarshal.h diff --git a/src/pya/pyaObject.cc b/src/pya/pya/pyaObject.cc similarity index 100% rename from src/pya/pyaObject.cc rename to src/pya/pya/pyaObject.cc diff --git a/src/pya/pyaObject.h b/src/pya/pya/pyaObject.h similarity index 100% rename from src/pya/pyaObject.h rename to src/pya/pya/pyaObject.h diff --git a/src/pya/pyaRefs.cc b/src/pya/pya/pyaRefs.cc similarity index 100% rename from src/pya/pyaRefs.cc rename to src/pya/pya/pyaRefs.cc diff --git a/src/pya/pyaRefs.h b/src/pya/pya/pyaRefs.h similarity index 100% rename from src/pya/pyaRefs.h rename to src/pya/pya/pyaRefs.h diff --git a/src/pya/pyaUtils.cc b/src/pya/pya/pyaUtils.cc similarity index 100% rename from src/pya/pyaUtils.cc rename to src/pya/pya/pyaUtils.cc diff --git a/src/pya/pyaUtils.h b/src/pya/pya/pyaUtils.h similarity index 100% rename from src/pya/pyaUtils.h rename to src/pya/pya/pyaUtils.h diff --git a/src/unit_tests/pya.cc b/src/pya/unit_tests/pya.cc similarity index 100% rename from src/unit_tests/pya.cc rename to src/pya/unit_tests/pya.cc diff --git a/src/pya/unit_tests/unit_tests.pro b/src/pya/unit_tests/unit_tests.pro new file mode 100644 index 000000000..2343cd481 --- /dev/null +++ b/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 + diff --git a/src/rba/rba.pro b/src/rba/rba.pro index 0a5a90b38..77360f239 100644 --- a/src/rba/rba.pro +++ b/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 diff --git a/src/rba/rba.cc b/src/rba/rba/rba.cc similarity index 100% rename from src/rba/rba.cc rename to src/rba/rba/rba.cc diff --git a/src/rba/rba.h b/src/rba/rba/rba.h similarity index 100% rename from src/rba/rba.h rename to src/rba/rba/rba.h diff --git a/src/rba/rba/rba.pro b/src/rba/rba/rba.pro new file mode 100644 index 000000000..83c7a2ae8 --- /dev/null +++ b/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 + diff --git a/src/rba/rbaCommon.h b/src/rba/rba/rbaCommon.h similarity index 100% rename from src/rba/rbaCommon.h rename to src/rba/rba/rbaCommon.h diff --git a/src/rba/rbaConvert.cc b/src/rba/rba/rbaConvert.cc similarity index 100% rename from src/rba/rbaConvert.cc rename to src/rba/rba/rbaConvert.cc diff --git a/src/rba/rbaConvert.h b/src/rba/rba/rbaConvert.h similarity index 100% rename from src/rba/rbaConvert.h rename to src/rba/rba/rbaConvert.h diff --git a/src/rba/rbaInspector.cc b/src/rba/rba/rbaInspector.cc similarity index 100% rename from src/rba/rbaInspector.cc rename to src/rba/rba/rbaInspector.cc diff --git a/src/rba/rbaInspector.h b/src/rba/rba/rbaInspector.h similarity index 100% rename from src/rba/rbaInspector.h rename to src/rba/rba/rbaInspector.h diff --git a/src/rba/rbaInternal.cc b/src/rba/rba/rbaInternal.cc similarity index 100% rename from src/rba/rbaInternal.cc rename to src/rba/rba/rbaInternal.cc diff --git a/src/rba/rbaInternal.h b/src/rba/rba/rbaInternal.h similarity index 100% rename from src/rba/rbaInternal.h rename to src/rba/rba/rbaInternal.h diff --git a/src/rba/rbaMarshal.cc b/src/rba/rba/rbaMarshal.cc similarity index 100% rename from src/rba/rbaMarshal.cc rename to src/rba/rba/rbaMarshal.cc diff --git a/src/rba/rbaMarshal.h b/src/rba/rba/rbaMarshal.h similarity index 100% rename from src/rba/rbaMarshal.h rename to src/rba/rba/rbaMarshal.h diff --git a/src/rba/rbaUtils.cc b/src/rba/rba/rbaUtils.cc similarity index 100% rename from src/rba/rbaUtils.cc rename to src/rba/rba/rbaUtils.cc diff --git a/src/rba/rbaUtils.h b/src/rba/rba/rbaUtils.h similarity index 100% rename from src/rba/rbaUtils.h rename to src/rba/rba/rbaUtils.h diff --git a/src/unit_tests/rba.cc b/src/rba/unit_tests/rba.cc similarity index 100% rename from src/unit_tests/rba.cc rename to src/rba/unit_tests/rba.cc diff --git a/src/rba/unit_tests/unit_tests.pro b/src/rba/unit_tests/unit_tests.pro new file mode 100644 index 000000000..d8e7ec233 --- /dev/null +++ b/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 + diff --git a/src/unit_tests/unit_tests.pro b/src/unit_tests/unit_tests.pro index 8a72f1421..989cb838e 100644 --- a/src/unit_tests/unit_tests.pro +++ b/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 -