From d7099edcae228bde931e3620f365fc323505c392 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@koefferlein.de>
Date: Sun, 23 Sep 2018 09:29:05 +0200
Subject: [PATCH] WIP: gcov enabled, added more test cases.

---
 src/klayout.pri                               |   2 +-
 src/plugins/tools/netx/testdata/hlp5.oas      | Bin 0 -> 763 bytes
 src/plugins/tools/netx/testdata/hlp6.oas      | Bin 0 -> 969 bytes
 src/plugins/tools/netx/testdata/hlp7.oas      | Bin 0 -> 693 bytes
 .../netx/unit_tests/dbHierProcessorTests.cc   |  24 ++++++++++++++++++
 5 files changed, 25 insertions(+), 1 deletion(-)
 create mode 100644 src/plugins/tools/netx/testdata/hlp5.oas
 create mode 100644 src/plugins/tools/netx/testdata/hlp6.oas
 create mode 100644 src/plugins/tools/netx/testdata/hlp7.oas

diff --git a/src/klayout.pri b/src/klayout.pri
index 07c8a0c41..298273ebc 100644
--- a/src/klayout.pri
+++ b/src/klayout.pri
@@ -113,7 +113,7 @@ msvc {
 
   CONFIG(gcov) {
     QMAKE_CXXFLAGS += -fprofile-arcs -ftest-coverage
-    QMAKE_LFLAGS += -fprofile-arcs -ftest-coverage
+    QMAKE_LFLAGS += --coverage
   }
 
   QMAKE_CXXFLAGS_WARN_ON += \
diff --git a/src/plugins/tools/netx/testdata/hlp5.oas b/src/plugins/tools/netx/testdata/hlp5.oas
new file mode 100644
index 0000000000000000000000000000000000000000..709b3a865b55b25c7f1001afe39bd338ee7df480
GIT binary patch
literal 763
zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rrGn#q9V6m{J>C6WUE)3cLR{TlgW|(I
zT|zuKSY&u*Akv|J*c8Z!as|hS_y@#0yZZR>Fauf4Y|b8@J}!pLU=Dk5s1rzvmq8?(
zk)c6yg~$Rnk%|wZGXy`ZVA>%rQn5q)gXoP%ObjA5SHxC`T!>o0#?5d>Q9#r(m62(K
z(gSU<GEo~wrVAP`*k8<L1j#=T5)d^2iLB7Q5G87u0%G2fy|9!~)Pj)-s6`KCAc%cI
z;{eYA)dg(4OoBfcI@EWFb2A*U6B4yfWng4E!1Gabg3JNcA2v5;fiwaIesX~X8jNnp
zf(<>u^Mk8HT~vdS=>QMVk+T>@YMHKx0d4JLVqg#{X^`v@W#DE=kzK$jQu0A`hxm{4
zOkndxYCxWP(8;_*9O$h#d~eimoM8m&2zelM!iRyEQSbx91epahnFK#D{p4ambxniO
zf%!~O+dlx^CsGNvaziuIi$*4q0<fJT1t8lRjxs?)@5MhRpkX2vAd4OxWCW=Tcp!Aa
Lk*Q%M0|o{Fn|2#g

literal 0
HcmV?d00001

diff --git a/src/plugins/tools/netx/testdata/hlp6.oas b/src/plugins/tools/netx/testdata/hlp6.oas
new file mode 100644
index 0000000000000000000000000000000000000000..a21da1c9c2992d0ea6e164d1bf78dec220eedc8f
GIT binary patch
literal 969
zcmd^7v1=1i9R9s`F_F7OoAbSf%H5z)5-1Hxa8N8t+JyEXO^cUeak(W<E*(lqA;J|w
zA{L2G>f#L!8G|UC+X)IC3f|D+jYk(VbU48wUBvh98g=kL@J;uAzwh^bzwf&@Yt~nd
z`L(KPm>C&K<zfj&Dfs(n^s;HKRyQrvSZ>y9meFk0m+N<|yGE_Gaz3GDw79*|{1-r@
zvT3!})~%&_qmh>Qmy}#uF&ee96kSs0#-eCtfIL88&kTr@B%P4H%!UK(=19lQg_Ip*
zAl;+s0rBrSNd*qCOl5F(486RYQ^32W(%bg|;o;R_Zu}L8MW71^`-M>|{EV2cU?*9+
zNJ{jYC=TY?9*T#qqlB0KPWzfSJ6>R~5seC`vMAUUrqgm8VJ|(Fd--^l>Ff|i<iT86
z44z1C4)_qqgtV6z43VyvK4>r<$U}TI%>|!f0J3e*>{C#ntviTpht$pSO`|nPS6Gb6
zNcZHzNnVHmX$9&*12TyF>}$>|te_v#3w(^SAwHFX-V~0-8l#`seVP!;!oU3mvmqzm
z-&H3ej6Wjp4KD@i)FgsnM?vj(mxkwP=}!iBMR@TGcBQYe=Lvd)yY~xB4?c-`!FDDm
zmVx(+s(_zqdLN`o5InsYEwT=F25+V4hsE4p+OLZCZz0|$yV&`L+!FYYCDIX*4Ikmr
k9wu8+W@JmG#eKzZf!pQ!q$7gjn+e={p!!v8|IY{D7cR75hyVZp

literal 0
HcmV?d00001

diff --git a/src/plugins/tools/netx/testdata/hlp7.oas b/src/plugins/tools/netx/testdata/hlp7.oas
new file mode 100644
index 0000000000000000000000000000000000000000..a167833a837033f9f79d6445be8fe47e52ef7042
GIT binary patch
literal 693
zcmY!lcJ=kt^>+;R4CduxWH!_@V0gjKfDB|rrGn#q9V6m{J>C6WUE)3cLR{TlgW|(I
zT|zuKSY&u*Akv|J*c8Z!as|hS_y@#0yZZR>Fauf4Y|b8@J}!pLU=FLZf0%0!FOx_y
z6T=m;3mO}mnM4X2Bzr^|L<&BL?htP{$|O>;L;Qp2i+@Zz#6>FJ@V!xgaFCHfB;bM2
z1xH>6k!(hW2FVp73)n;|K8Vf`{ICM745Z`6BPIrsnk!-}L@q=vVB=;uqbMM1naaqt
zLFs`uSed8|Bhv+q7wj+QGJ@nE2nmQ9fJ9d4UWfv+SPt-f6rCV*K=p&Ds9_37;)d*n
zrHrB$j7&fS^gzag*avt%h%zi-gJ?a#b3m1sQSb-D1eqP;+{`c7H?Z_G3NUS85&XgQ
zVG#=hH^TutA(3*pU%459d?t|+u#Xu;N}yf_x*P6iARFds29XeuuNjycMlxVv000zI
B0h<5-

literal 0
HcmV?d00001

diff --git a/src/plugins/tools/netx/unit_tests/dbHierProcessorTests.cc b/src/plugins/tools/netx/unit_tests/dbHierProcessorTests.cc
index d7bd48367..5d82fc840 100644
--- a/src/plugins/tools/netx/unit_tests/dbHierProcessorTests.cc
+++ b/src/plugins/tools/netx/unit_tests/dbHierProcessorTests.cc
@@ -160,3 +160,27 @@ TEST(BasicNot5)
   //  Variant building with intermediate hierarchy, NOT
   run_test_bool (_this, "hlp5.oas", TMNot, 101);
 }
+
+TEST(BasicAnd6)
+{
+  //  Extreme variants (copy, vanishing), AND
+  run_test_bool (_this, "hlp6.oas", TMAnd, 100);
+}
+
+TEST(BasicNot6)
+{
+  //  Extreme variants (copy, vanishing), NOT
+  run_test_bool (_this, "hlp6.oas", TMNot, 101);
+}
+
+TEST(BasicAnd7)
+{
+  //  Context replication - direct and indirect, AND
+  run_test_bool (_this, "hlp7.oas", TMAnd, 100);
+}
+
+TEST(BasicNot7)
+{
+  //  Context replication - direct and indirect, NOT
+  run_test_bool (_this, "hlp7.oas", TMNot, 101);
+}