luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed MSVC build, fixed unit tests.

This commit is contained in:
Matthias Koefferlein 2019-05-10 21:09:19 +02:00
parent 0f0dd42b4d
commit 6f689863b6
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/db/unit_tests/dbNetlistTests.cc
View File

@ -1023,8 +1023,8 @@ TEST(12_NetlistTopology)
c2->set_name ("c2");
nl->add_circuit (c2);
EXPECT_EQ (nl->top_circuit_count (), size_t (2));
EXPECT_EQ (td2string (nl.get ()), "c1,c2");
EXPECT_EQ (bu2string (nl.get ()), "c2,c1");
EXPECT_EQ (td2string (nl.get ()), "c2,c1");
EXPECT_EQ (bu2string (nl.get ()), "c1,c2");
std::auto_ptr<db::NetlistLocker> locker (new db::NetlistLocker (nl.get ()));
@ -1034,14 +1034,14 @@ TEST(12_NetlistTopology)
// because we locked, it did not get updated:
EXPECT_EQ (nl->top_circuit_count (), size_t (2));
EXPECT_EQ (td2string (nl.get ()), "c1,c2");
EXPECT_EQ (bu2string (nl.get ()), "c2,c1");
EXPECT_EQ (td2string (nl.get ()), "c2,c1");
EXPECT_EQ (bu2string (nl.get ()), "c1,c2");
locker.reset (0);
// after removing the lock, it's updated
EXPECT_EQ (nl->top_circuit_count (), size_t (3));
EXPECT_EQ (td2string (nl.get ()), "c1,c2,c3");
EXPECT_EQ (bu2string (nl.get ()), "c3,c2,c1");
EXPECT_EQ (td2string (nl.get ()), "c3,c2,c1");
EXPECT_EQ (bu2string (nl.get ()), "c1,c2,c3");
db::SubCircuit *sc1 = new db::SubCircuit (c2);
sc1->set_name ("sc1");
@ -1049,8 +1049,8 @@ TEST(12_NetlistTopology)
EXPECT_EQ (children2string (c1), "c2");
EXPECT_EQ (parents2string (c2), "c1");
EXPECT_EQ (nl->top_circuit_count (), size_t (2));
EXPECT_EQ (td2string (nl.get ()), "c1,c3,c2");
EXPECT_EQ (bu2string (nl.get ()), "c2,c3,c1");
EXPECT_EQ (td2string (nl.get ()), "c3,c1,c2");
EXPECT_EQ (bu2string (nl.get ()), "c2,c1,c3");
db::SubCircuit *sc2 = new db::SubCircuit (c2);
sc2->set_name ("sc2");
@ -1058,8 +1058,8 @@ TEST(12_NetlistTopology)
EXPECT_EQ (children2string (c1), "c2");
EXPECT_EQ (parents2string (c2), "c1");
EXPECT_EQ (nl->top_circuit_count (), size_t (2));
EXPECT_EQ (td2string (nl.get ()), "c1,c3,c2");
EXPECT_EQ (bu2string (nl.get ()), "c2,c3,c1");
EXPECT_EQ (td2string (nl.get ()), "c3,c1,c2");
EXPECT_EQ (bu2string (nl.get ()), "c2,c1,c3");
db::SubCircuit *sc3 = new db::SubCircuit (c3);
sc3->set_name ("sc3");
@ -1070,8 +1070,8 @@ TEST(12_NetlistTopology)
EXPECT_EQ (parents2string (c2), "c1");
EXPECT_EQ (parents2string (c3), "c1");
EXPECT_EQ (nl->top_circuit_count (), size_t (1));
EXPECT_EQ (td2string (nl.get ()), "c1,c2,c3");
EXPECT_EQ (bu2string (nl.get ()), "c3,c2,c1");
EXPECT_EQ (td2string (nl.get ()), "c1,c3,c2");
EXPECT_EQ (bu2string (nl.get ()), "c2,c3,c1");
db::SubCircuit *sc4 = new db::SubCircuit (*sc2);
sc4->set_name ("sc4");

14
src/laybasic/laybasic/layNetExportDialog.cc
View File

@ -33,13 +33,13 @@
namespace lay
{
extern std::string cfg_l2ndb_export_net_cell_prefix;
extern std::string cfg_l2ndb_export_net_propname;
extern std::string cfg_l2ndb_export_circuit_cell_prefix;
extern std::string cfg_l2ndb_export_produce_circuit_cells;
extern std::string cfg_l2ndb_export_device_cell_prefix;
extern std::string cfg_l2ndb_export_produce_device_cells;
extern std::string cfg_l2ndb_export_start_layer_number;
extern const std::string cfg_l2ndb_export_net_cell_prefix;
extern const std::string cfg_l2ndb_export_net_propname;
extern const std::string cfg_l2ndb_export_circuit_cell_prefix;
extern const std::string cfg_l2ndb_export_produce_circuit_cells;
extern const std::string cfg_l2ndb_export_device_cell_prefix;
extern const std::string cfg_l2ndb_export_produce_device_cells;
extern const std::string cfg_l2ndb_export_start_layer_number;
NetExportDialog::NetExportDialog (QWidget *parent)

2
src/laybasic/laybasic/layNetlistBrowser.cc
View File

@ -21,7 +21,7 @@
*/
#include "laybasicCommon.h"
#include "layNetlistBrowserDialog.h"
#include "layConverters.h"

2
src/laybasic/laybasic/layNetlistBrowserPage.cc
View File

@ -48,7 +48,7 @@
namespace lay
{
extern std::string cfg_l2ndb_show_all;
extern const std::string cfg_l2ndb_show_all;
// ----------------------------------------------------------------------------------
// NetlistBrowserPage implementation