From b09d63e780236b8ef9641e4bd80150195cda9389 Mon Sep 17 00:00:00 2001
From: Matthias Koefferlein <matthias@klayout.de>
Date: Sat, 23 Sep 2023 00:57:57 +0200
Subject: [PATCH] Doc update, test updates

---
 src/db/db/gsiDeclDbNetlist.cc                 |   3 ++-
 src/db/unit_tests/dbLayoutToNetlistTests.cc   |  10 +++++-----
 .../algo/device_extract_au1_joined_nets.gds   | Bin 11098 -> 11114 bytes
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/db/db/gsiDeclDbNetlist.cc b/src/db/db/gsiDeclDbNetlist.cc
index af209c40e..29f2e7396 100644
--- a/src/db/db/gsiDeclDbNetlist.cc
+++ b/src/db/db/gsiDeclDbNetlist.cc
@@ -1659,7 +1659,8 @@ Class<db::Circuit> decl_dbCircuit (decl_dbNetlistObject, "db", "Circuit",
     "@brief Joins (connects) two nets into one\n"
     "This method will connect the 'with' net with 'net' and remove 'with'.\n"
     "\n"
-    "This method has been introduced in version 0.26.4."
+    "This method has been introduced in version 0.26.4. Starting with version 0.28.13, "
+    "net names will be formed from both input names, combining them with as a comma-separated list."
   ) +
   gsi::iterator ("each_net", (db::Circuit::net_iterator (db::Circuit::*) ()) &db::Circuit::begin_nets, (db::Circuit::net_iterator (db::Circuit::*) ()) &db::Circuit::end_nets,
     "@brief Iterates over the nets of the circuit"
diff --git a/src/db/unit_tests/dbLayoutToNetlistTests.cc b/src/db/unit_tests/dbLayoutToNetlistTests.cc
index d7524ad70..b36e38a07 100644
--- a/src/db/unit_tests/dbLayoutToNetlistTests.cc
+++ b/src/db/unit_tests/dbLayoutToNetlistTests.cc
@@ -608,12 +608,12 @@ TEST(1_BasicExtraction)
   //  do some probing after purging
 
   //  top level
-  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal2, db::DPoint (0.0, 1.8))), "RINGO:FB");
-  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal2, db::Point (0, 1800))), "RINGO:FB");
+  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal2, db::DPoint (0.0, 1.8))), "RINGO:FB,OSC");
+  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal2, db::Point (0, 1800))), "RINGO:FB,OSC");
   EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal2, db::DPoint (-2.0, 1.8))), "(null)");
-  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (-1.5, 1.8))), "RINGO:FB");
-  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (24.5, 1.8))), "RINGO:FB");
-  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (5.3, 0.0))), "RINGO:VSS");
+  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (-1.5, 1.8))), "RINGO:FB,OSC");
+  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (24.5, 1.8))), "RINGO:FB,OSC");
+  EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (5.3, 0.0))), "RINGO:VDD,VSS");
 
   EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (2.6, 1.0))), "RINGO:$I39");
   EXPECT_EQ (qnet_name (l2n.probe_net (*rmetal1, db::DPoint (6.4, 1.0))), "RINGO:$I2");
diff --git a/testdata/algo/device_extract_au1_joined_nets.gds b/testdata/algo/device_extract_au1_joined_nets.gds
index ceda8361f0d0f8d30c9c51e1b66eab86503269a6..919bc22a386387a2fb17bf0edbf8b1c537131af6 100644
GIT binary patch
delta 1537
zcmcZ=_9`rjfsKKQDS|<Uk%|2|11Ezx0|SEv13xmGfrE+7$J2>{L4=vr&au<n``Gdi
zmM%N=7tD?dVUS_Psc&Lbyf_XcCtirfB{kWF5vR7vyBKln(__M|ZwVebDdxL4-NMI$
z+rB0|a^F~@ahjRIid*g$D{i-(W5ewhCwAO&+t_j1w^@V3nHiTuH#c$Pk-Woaja#Rl
z(04|h#@dL;vf`4QTp%f0k0Z@6aIvwusQCH%2Q#p+GvG^j3_Ku}0YH^1h6L4uO$Dii
zsdPe4`^apN144ov{el@_N|9xe*^}L*5^;KQA09a~Y25nO;gM65!L4r|9yu{t-1_?P
z$g#=c)>kKIiPP`r@W{!@<JOmlM{XY;IX(s4X2#)>TZc#PpMs?tt|ThJ#^&c55+CN`
zq7xPzJo%%d?B+7Xr%bB2)bl~qyE*Cj2Rm=BQTfS;E9f@&s0reh+@h|^sLLk=wj5#@
e1CIbRuqcNB7C~T=<ziqEfT#dDZ}UHm7$yK_zUV^$

delta 1509
zcmaDAb}KB3fsKKQDS|<Uk%|2Y0~3Q3gE)f*gA_8GfrE+7$J2>{L4=vr&au<n``Gdi
zmM%N=7tD?dVUS_Psc&Lbyf_XcCtirfB{kWF5vR7vyBKln(__M|ZwVebDdxL4-NMI$
z+rB0|a^F~@ahjRIid*g$D{i-(W5ewhCwAO&+t_j1w^@V3nHiTuH#c$Pk-Woaja#Rl
z(04|h#@dL;vf`4QTp%f0k0Z@6aIvwusQCH%2Q#p+GvG^j3_Ku}0YH^1h6L4uO$Dii
zsdPe4`^apN144ov{el@_N|9xe*^}L*5^;KQA09a~Y25nO;gM65!L4r|9yu{t-1_?P
z$g#=c)>kKIiPP`r@W{!@<JOmlM{XY;IX(s4X2#)>TZc#PpMs?lt|SUfcz&)S@nONi
zlO2_0H&-b>Wm3eY7MPkqYTcYBcgaa@o~Lr35m&Hno}wm*TXK)ODkCSC5X`U(>Z0sC
L5Z-1!%@`&CK-}pl