From 1285868546db543d6b06ad72419c8e0fce407b20 Mon Sep 17 00:00:00 2001 From: Matthias Koefferlein Date: Sat, 1 May 2021 21:36:52 +0200 Subject: [PATCH] Skip private-only tests without private data access --- src/buddies/unit_tests/bdConverterTests.cc | 28 +- src/buddies/unit_tests/bdStrm2txtTests.cc | 8 +- src/buddies/unit_tests/bdStrmclipTests.cc | 24 +- src/buddies/unit_tests/bdStrmcmpTests.cc | 168 ++++----- src/buddies/unit_tests/bdStrmxorTests.cc | 208 +++++------ src/db/unit_tests/dbBoxScannerTests.cc | 4 +- src/db/unit_tests/dbCellVariantsTests.cc | 12 +- src/db/unit_tests/dbCompoundOperationTests.cc | 68 ++-- src/db/unit_tests/dbDeepEdgePairsTests.cc | 6 +- src/db/unit_tests/dbDeepEdgesTests.cc | 62 ++-- src/db/unit_tests/dbDeepRegionTests.cc | 260 +++++++------- src/db/unit_tests/dbDeepTextsTests.cc | 18 +- src/db/unit_tests/dbEdgeProcessorTests.cc | 44 +-- src/db/unit_tests/dbFillToolTests.cc | 54 +-- .../unit_tests/dbHierNetworkProcessorTests.cc | 16 +- src/db/unit_tests/dbHierProcessorTests.cc | 2 +- src/db/unit_tests/dbHierarchyBuilderTests.cc | 84 ++--- .../dbLayoutToNetlistReaderTests.cc | 54 ++- src/db/unit_tests/dbLayoutToNetlistTests.cc | 93 ++--- .../dbLayoutToNetlistWriterTests.cc | 22 +- src/db/unit_tests/dbLayoutUtilsTests.cc | 138 ++++---- src/db/unit_tests/dbLayoutVsSchematicTests.cc | 20 +- src/db/unit_tests/dbLibrariesTests.cc | 4 +- .../dbNetlistDeviceExtractorTests.cc | 36 +- src/db/unit_tests/dbNetlistExtractorTests.cc | 81 ++--- src/db/unit_tests/dbNetlistReaderTests.cc | 28 +- src/db/unit_tests/dbNetlistWriterTests.cc | 40 +-- src/db/unit_tests/dbPCellsTests.cc | 28 +- src/db/unit_tests/dbRegionTests.cc | 24 +- src/drc/unit_tests/drcBasicTests.cc | 8 +- src/drc/unit_tests/drcGenericTests.cc | 12 +- src/drc/unit_tests/drcSimpleTests.cc | 324 +++++++++--------- src/drc/unit_tests/drcSuiteTests.cc | 12 +- src/lay/unit_tests/laySessionTests.cc | 12 +- .../unit_tests/layNetlistBrowserModelTests.cc | 12 +- .../layNetlistBrowserTreeModelTests.cc | 4 +- src/lvs/unit_tests/lvsBasicTests.cc | 24 +- src/lvs/unit_tests/lvsSimpleTests.cc | 20 +- src/lvs/unit_tests/lvsTests.cc | 4 +- .../streamers/cif/unit_tests/dbCIFReader.cc | 32 +- .../dxf/unit_tests/dbDXFReaderTests.cc | 8 +- .../streamers/gds2/unit_tests/dbGDS2Reader.cc | 66 ++-- .../streamers/gds2/unit_tests/dbGDS2Writer.cc | 16 +- .../lefdef/unit_tests/dbLEFDEFImportTests.cc | 16 +- .../streamers/magic/unit_tests/dbMAGReader.cc | 10 +- .../oasis/unit_tests/dbOASISReaderTests.cc | 36 +- .../oasis/unit_tests/dbOASISWriter.cc | 28 +- .../oasis/unit_tests/dbOASISWriter2.cc | 4 +- .../pcb/unit_tests/dbGerberImport.cc | 38 +- .../net_tracer/unit_tests/dbNetTracerTests.cc | 16 +- .../net_tracer/unit_tests/dbTraceAllNets.cc | 8 +- src/pymod/unit_tests/pymod_tests.cc | 4 +- src/rdb/unit_tests/rdbRVEReaderTests.cc | 4 +- src/tl/tl/tlUnitTest.cc | 11 +- src/tl/tl/tlUnitTest.h | 12 +- src/tl/unit_tests/tlIncludeTests.cc | 24 +- 56 files changed, 1162 insertions(+), 1237 deletions(-) diff --git a/src/buddies/unit_tests/bdConverterTests.cc b/src/buddies/unit_tests/bdConverterTests.cc index 575c13bf6..2333a9e89 100644 --- a/src/buddies/unit_tests/bdConverterTests.cc +++ b/src/buddies/unit_tests/bdConverterTests.cc @@ -30,8 +30,8 @@ // Testing the converter main implementation (CIF) TEST(1) { - std::string input = tl::testsrc (); - input += "/testdata/gds/t10.gds"; + std::string input = tl::testdata (); + input += "/gds/t10.gds"; std::string output = this->tmp_file (); @@ -55,8 +55,8 @@ TEST(1) // Testing the converter main implementation (DXF) TEST(2) { - std::string input = tl::testsrc (); - input += "/testdata/gds/t10.gds"; + std::string input = tl::testdata (); + input += "/gds/t10.gds"; std::string output = this->tmp_file (); @@ -86,8 +86,8 @@ TEST(2) // Testing the converter main implementation (GDS2) TEST(3) { - std::string input = tl::testsrc (); - input += "/testdata/gds/t10.gds"; + std::string input = tl::testdata (); + input += "/gds/t10.gds"; std::string output = this->tmp_file (); @@ -111,8 +111,8 @@ TEST(3) // Testing the converter main implementation (GDS2Text) TEST(4) { - std::string input = tl::testsrc (); - input += "/testdata/gds/t10.gds"; + std::string input = tl::testdata (); + input += "/gds/t10.gds"; std::string output = this->tmp_file (); @@ -136,8 +136,8 @@ TEST(4) // Testing the converter main implementation (OASIS) TEST(5) { - std::string input = tl::testsrc (); - input += "/testdata/gds/t10.gds"; + std::string input = tl::testdata (); + input += "/gds/t10.gds"; std::string output = this->tmp_file (); @@ -161,11 +161,11 @@ TEST(5) // Testing the converter main implementation (MAG) TEST(6) { - std::string input = tl::testsrc (); - input += "/testdata/gds/t10.gds"; + std::string input = tl::testdata (); + input += "/gds/t10.gds"; - std::string input_au = tl::testsrc (); - input_au += "/testdata/magic/strm2mag_au.gds"; + std::string input_au = tl::testdata (); + input_au += "/magic/strm2mag_au.gds"; std::string output = this->tmp_file ("RINGO.mag"); diff --git a/src/buddies/unit_tests/bdStrm2txtTests.cc b/src/buddies/unit_tests/bdStrm2txtTests.cc index dd5bb14d4..78c44f537 100644 --- a/src/buddies/unit_tests/bdStrm2txtTests.cc +++ b/src/buddies/unit_tests/bdStrm2txtTests.cc @@ -27,11 +27,11 @@ BD_PUBLIC int strm2txt (int argc, char *argv[]); TEST(1) { - std::string input = tl::testsrc (); - input += "/testdata/gds/t10.gds"; + std::string input = tl::testdata (); + input += "/gds/t10.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strm2txt_au.txt"; + std::string au = tl::testdata (); + au += "/bd/strm2txt_au.txt"; std::string output = this->tmp_file (); diff --git a/src/buddies/unit_tests/bdStrmclipTests.cc b/src/buddies/unit_tests/bdStrmclipTests.cc index bd84d013f..37da7c661 100644 --- a/src/buddies/unit_tests/bdStrmclipTests.cc +++ b/src/buddies/unit_tests/bdStrmclipTests.cc @@ -29,11 +29,11 @@ BD_PUBLIC int strmclip (int argc, char *argv[]); TEST(1A) { - std::string input = tl::testsrc (); - input += "/testdata/bd/strm2clip_in.gds"; + std::string input = tl::testdata (); + input += "/bd/strm2clip_in.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strm2clip_au1.gds"; + std::string au = tl::testdata (); + au += "/bd/strm2clip_au1.gds"; std::string output = this->tmp_file (); @@ -54,11 +54,11 @@ TEST(1A) TEST(1B) { - std::string input = tl::testsrc (); - input += "/testdata/bd/strm2clip_in.gds"; + std::string input = tl::testdata (); + input += "/bd/strm2clip_in.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strm2clip_au1.gds"; + std::string au = tl::testdata (); + au += "/bd/strm2clip_au1.gds"; std::string output = this->tmp_file (); @@ -79,11 +79,11 @@ TEST(1B) TEST(2) { - std::string input = tl::testsrc (); - input += "/testdata/bd/strm2clip_in.gds"; + std::string input = tl::testdata (); + input += "/bd/strm2clip_in.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strm2clip_au2.gds"; + std::string au = tl::testdata (); + au += "/bd/strm2clip_au2.gds"; std::string output = this->tmp_file (); diff --git a/src/buddies/unit_tests/bdStrmcmpTests.cc b/src/buddies/unit_tests/bdStrmcmpTests.cc index c8acdae55..78dac4666 100644 --- a/src/buddies/unit_tests/bdStrmcmpTests.cc +++ b/src/buddies/unit_tests/bdStrmcmpTests.cc @@ -39,11 +39,11 @@ TEST(1) cap.clear (); EXPECT_EQ (cap.captured_text (), ""); - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref1.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref1.gds"; const char *argv[] = { "x", input_a.c_str (), input_b.c_str () }; @@ -56,11 +56,11 @@ TEST(2A) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref2.gds"; const char *argv[] = { "x", input_a.c_str (), input_b.c_str () }; @@ -85,11 +85,11 @@ TEST(2B) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref2.gds"; const char *argv[] = { "x", "-s", input_a.c_str (), input_b.c_str () }; @@ -102,11 +102,11 @@ TEST(2C) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref2.gds"; const char *argv[] = { "x", "-am=8/0", "-as", "-bm=8/0", "-bs", input_a.c_str (), input_b.c_str () }; @@ -126,11 +126,11 @@ TEST(2D) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref2.gds"; const char *argv[] = { "x", "-m=1", input_a.c_str (), input_b.c_str () }; @@ -147,11 +147,11 @@ TEST(2E) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref2.gds"; const char *argv[] = { "x", "-ta=INV2", "-tb=INV2", input_a.c_str (), input_b.c_str () }; @@ -162,11 +162,11 @@ TEST(2F) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref2.gds"; const char *argv[] = { "x", "-u", input_a.c_str (), input_b.c_str () }; @@ -185,11 +185,11 @@ TEST(3A) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref3.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref3.gds"; const char *argv[] = { "x", input_a.c_str (), input_b.c_str () }; @@ -209,11 +209,11 @@ TEST(3B) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref3.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref3.gds"; const char *argv[] = { "x", "-t=0.001", input_a.c_str (), input_b.c_str () }; @@ -224,11 +224,11 @@ TEST(4A) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref4.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref4.gds"; const char *argv[] = { "x", input_a.c_str (), input_b.c_str () }; @@ -251,11 +251,11 @@ TEST(4B) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref4.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref4.gds"; const char *argv[] = { "x", "-p", input_a.c_str (), input_b.c_str () }; @@ -266,11 +266,11 @@ TEST(5A) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref5.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref5.gds"; const char *argv[] = { "x", "-u", input_a.c_str (), input_b.c_str () }; @@ -286,11 +286,11 @@ TEST(5B) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref5.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref5.gds"; const char *argv[] = { "x", "--expand-arrays", input_a.c_str (), input_b.c_str () }; @@ -301,11 +301,11 @@ TEST(6A) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref6.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref6.gds"; const char *argv[] = { "x", "-r", input_a.c_str (), input_b.c_str () }; @@ -325,11 +325,11 @@ TEST(6B) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref6.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref6.gds"; const char *argv[] = { "x", "-np", input_a.c_str (), input_b.c_str () }; @@ -340,11 +340,11 @@ TEST(7A) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref7.oas"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref7.oas"; const char *argv[] = { "x", input_a.c_str (), input_b.c_str () }; @@ -360,11 +360,11 @@ TEST(7B) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref7.oas"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref7.oas"; const char *argv[] = { "x", "-nl", input_a.c_str (), input_b.c_str () }; @@ -375,11 +375,11 @@ TEST(8A) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref8.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref8.gds"; const char *argv[] = { "x", input_a.c_str (), input_b.c_str () }; @@ -407,11 +407,11 @@ TEST(8B) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref8.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref8.gds"; const char *argv[] = { "x", "-c", input_a.c_str (), input_b.c_str () }; @@ -426,11 +426,11 @@ TEST(9A) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref9.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref9.gds"; const char *argv[] = { "x", input_a.c_str (), input_b.c_str () }; @@ -446,11 +446,11 @@ TEST(9B) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmcmp_in.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmcmp_in.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmcmp_ref9.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmcmp_ref9.gds"; const char *argv[] = { "x", "-l", input_a.c_str (), input_b.c_str () }; diff --git a/src/buddies/unit_tests/bdStrmxorTests.cc b/src/buddies/unit_tests/bdStrmxorTests.cc index d1d2ee3c6..9c8b8a3b4 100644 --- a/src/buddies/unit_tests/bdStrmxorTests.cc +++ b/src/buddies/unit_tests/bdStrmxorTests.cc @@ -34,11 +34,11 @@ TEST(0_Basic_Flat) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in1.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in1.gds"; std::string output = this->tmp_file ("tmp.oas"); @@ -55,11 +55,11 @@ TEST(0_Basic_Deep) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in1.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in1.gds"; std::string output = this->tmp_file ("tmp.oas"); @@ -76,14 +76,14 @@ TEST(1A_Flat) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strmxor_au1.oas"; + std::string au = tl::testdata (); + au += "/bd/strmxor_au1.oas"; std::string output = this->tmp_file ("tmp.oas"); @@ -118,14 +118,14 @@ TEST(1A_Deep) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strmxor_au1d.oas"; + std::string au = tl::testdata (); + au += "/bd/strmxor_au1d.oas"; std::string output = this->tmp_file ("tmp.oas"); @@ -160,11 +160,11 @@ TEST(1B_Flat) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; std::string output = this->tmp_file ("tmp.oas"); @@ -190,11 +190,11 @@ TEST(1B_Deep) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; std::string output = this->tmp_file ("tmp.oas"); @@ -220,11 +220,11 @@ TEST(1C_Flat) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; std::string output = this->tmp_file ("tmp.oas"); @@ -241,11 +241,11 @@ TEST(1C_Deep) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; std::string output = this->tmp_file ("tmp.oas"); @@ -262,11 +262,11 @@ TEST(1D_Flat) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; std::string output = this->tmp_file ("tmp.oas"); @@ -280,11 +280,11 @@ TEST(1D_Deep) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; std::string output = this->tmp_file ("tmp.oas"); @@ -298,14 +298,14 @@ TEST(2_Flat) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strmxor_au2.oas"; + std::string au = tl::testdata (); + au += "/bd/strmxor_au2.oas"; std::string output = this->tmp_file ("tmp.oas"); @@ -331,14 +331,14 @@ TEST(2_Deep) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strmxor_au2d.oas"; + std::string au = tl::testdata (); + au += "/bd/strmxor_au2d.oas"; std::string output = this->tmp_file ("tmp.oas"); @@ -364,14 +364,14 @@ TEST(3_Flat) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strmxor_au3.oas"; + std::string au = tl::testdata (); + au += "/bd/strmxor_au3.oas"; std::string output = this->tmp_file ("tmp.oas"); @@ -397,14 +397,14 @@ TEST(3_Deep) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strmxor_au3d.oas"; + std::string au = tl::testdata (); + au += "/bd/strmxor_au3d.oas"; std::string output = this->tmp_file ("tmp.oas"); @@ -431,14 +431,14 @@ TEST(4_Flat) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strmxor_au4.oas"; + std::string au = tl::testdata (); + au += "/bd/strmxor_au4.oas"; std::string output = this->tmp_file ("tmp.oas"); @@ -464,14 +464,14 @@ TEST(4_Deep) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strmxor_au4d.oas"; + std::string au = tl::testdata (); + au += "/bd/strmxor_au4d.oas"; std::string output = this->tmp_file ("tmp.oas"); @@ -497,14 +497,14 @@ TEST(5_Flat) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strmxor_au5.oas"; + std::string au = tl::testdata (); + au += "/bd/strmxor_au5.oas"; std::string output = this->tmp_file ("tmp.oas"); @@ -530,14 +530,14 @@ TEST(5_Deep) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strmxor_au5d.oas"; + std::string au = tl::testdata (); + au += "/bd/strmxor_au5d.oas"; std::string output = this->tmp_file ("tmp.oas"); @@ -563,14 +563,14 @@ TEST(6_Flat) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strmxor_au6.oas"; + std::string au = tl::testdata (); + au += "/bd/strmxor_au6.oas"; std::string output = this->tmp_file ("tmp.oas"); @@ -596,14 +596,14 @@ TEST(6_Deep) { tl::CaptureChannel cap; - std::string input_a = tl::testsrc (); - input_a += "/testdata/bd/strmxor_in1.gds"; + std::string input_a = tl::testdata (); + input_a += "/bd/strmxor_in1.gds"; - std::string input_b = tl::testsrc (); - input_b += "/testdata/bd/strmxor_in2.gds"; + std::string input_b = tl::testdata (); + input_b += "/bd/strmxor_in2.gds"; - std::string au = tl::testsrc (); - au += "/testdata/bd/strmxor_au6d.oas"; + std::string au = tl::testdata (); + au += "/bd/strmxor_au6d.oas"; std::string output = this->tmp_file ("tmp.oas"); diff --git a/src/db/unit_tests/dbBoxScannerTests.cc b/src/db/unit_tests/dbBoxScannerTests.cc index ff9434389..63e73efae 100644 --- a/src/db/unit_tests/dbBoxScannerTests.cc +++ b/src/db/unit_tests/dbBoxScannerTests.cc @@ -799,8 +799,8 @@ struct BooleanAndInteractionClusterCollector TEST(100) { - std::string fn (tl::testsrc_private ()); - fn += "/testdata/other/"; + std::string fn (tl::testdata_private ()); + fn += "/other/"; fn += "bs100.oas.gz"; db::Layout layout; diff --git a/src/db/unit_tests/dbCellVariantsTests.cc b/src/db/unit_tests/dbCellVariantsTests.cc index 83d58db25..7da60cae3 100644 --- a/src/db/unit_tests/dbCellVariantsTests.cc +++ b/src/db/unit_tests/dbCellVariantsTests.cc @@ -374,8 +374,8 @@ TEST(100_OrientationVariantsWithLayout) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -390,15 +390,15 @@ TEST(100_OrientationVariantsWithLayout) vb.separate_variants (ly, top_cell); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/cell_variants_au1.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/cell_variants_au1.gds"); } TEST(101_Propagation) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/cell_variants_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/cell_variants_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -434,5 +434,5 @@ TEST(101_Propagation) vb.commit_shapes (ly, top_cell, l2, to_commit); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/cell_variants_au2.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/cell_variants_au2.gds"); } diff --git a/src/db/unit_tests/dbCompoundOperationTests.cc b/src/db/unit_tests/dbCompoundOperationTests.cc index a0d305afa..73521e686 100644 --- a/src/db/unit_tests/dbCompoundOperationTests.cc +++ b/src/db/unit_tests/dbCompoundOperationTests.cc @@ -50,9 +50,9 @@ static void prep_layer (db::Layout &ly, int gds_layer, db::Region &r, db::DeepSh static std::string make_au (const std::string &num, bool deep) { if (deep) { - return tl::testsrc () + "/testdata/drc/compound_au" + num + "d.gds"; + return tl::testdata () + "/drc/compound_au" + num + "d.gds"; } else { - return tl::testsrc () + "/testdata/drc/compound_au" + num + ".gds"; + return tl::testdata () + "/drc/compound_au" + num + ".gds"; } } @@ -60,8 +60,8 @@ void run_test1 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_1.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -125,8 +125,8 @@ void run_test2 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_2.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -179,8 +179,8 @@ void run_test3 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_3.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_3.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -226,8 +226,8 @@ void run_test4 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_4.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_4.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -273,8 +273,8 @@ void run_test5 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_5.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_5.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -316,8 +316,8 @@ void run_test6 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_6.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_6.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -361,8 +361,8 @@ void run_test7 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_7.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_7.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -405,8 +405,8 @@ void run_test8 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_8.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_8.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -450,8 +450,8 @@ void run_test9 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_9.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_9.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -516,8 +516,8 @@ void run_test10 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_10.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_10.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -592,8 +592,8 @@ void run_test11 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_11.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_11.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -642,8 +642,8 @@ void run_test12 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_12.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_12.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -717,8 +717,8 @@ void run_test13 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_13.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_13.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -761,8 +761,8 @@ void run_test14 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_14.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_14.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -818,8 +818,8 @@ void run_test15 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_15.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_15.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -873,8 +873,8 @@ void run_test16 (tl::TestBase *_this, bool deep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/drc/compound_16.gds"; + std::string fn (tl::testdata ()); + fn += "/drc/compound_16.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); diff --git a/src/db/unit_tests/dbDeepEdgePairsTests.cc b/src/db/unit_tests/dbDeepEdgePairsTests.cc index 2138d440f..a11bae0e8 100644 --- a/src/db/unit_tests/dbDeepEdgePairsTests.cc +++ b/src/db/unit_tests/dbDeepEdgePairsTests.cc @@ -35,8 +35,8 @@ TEST(1_Basics) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -102,5 +102,5 @@ TEST(1_Basics) ep2_copy.insert_into_as_polygons (&target, target_top_cell_index, target.get_layer (db::LayerProperties (14, 0)), 1); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_edge_pairs_au1.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_edge_pairs_au1.gds"); } diff --git a/src/db/unit_tests/dbDeepEdgesTests.cc b/src/db/unit_tests/dbDeepEdgesTests.cc index 06125dbc8..f1c3b4a9d 100644 --- a/src/db/unit_tests/dbDeepEdgesTests.cc +++ b/src/db/unit_tests/dbDeepEdgesTests.cc @@ -36,8 +36,8 @@ TEST(1) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -90,15 +90,15 @@ TEST(1) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_edges_au1.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_edges_au1.gds"); } TEST(2_MergeEdges) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -124,15 +124,15 @@ TEST(2_MergeEdges) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (11, 0)), r3_merged); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_edges_au2.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_edges_au2.gds"); } TEST(3_Edge2EdgeBooleans) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -168,15 +168,15 @@ TEST(3_Edge2EdgeBooleans) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (24, 0)), e3.intersections(e2)); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_edges_au3.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_edges_au3.gds"); } TEST(4_Edge2PolygonBooleans) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -213,15 +213,15 @@ TEST(4_Edge2PolygonBooleans) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (23, 0)), e3.outside_part (r2and3)); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_edges_au4.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_edges_au4.gds"); } TEST(5_Filters) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -250,7 +250,7 @@ TEST(5_Filters) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (11, 0)), e2.filtered (elf2)); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_edges_au5a.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_edges_au5a.gds"); } { @@ -266,7 +266,7 @@ TEST(5_Filters) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (11, 0)), e2.filtered (eof2)); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_edges_au5b.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_edges_au5b.gds"); } } @@ -274,8 +274,8 @@ TEST(6_Extended) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -314,15 +314,15 @@ TEST(6_Extended) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (13, 0)), e2e4); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_edges_au6.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_edges_au6.gds"); } TEST(7_Partial) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -362,15 +362,15 @@ TEST(7_Partial) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (33, 0)), e2f.centers (0, 0.2)); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_edges_au7.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_edges_au7.gds"); } TEST(8_SelectInteracting) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -460,15 +460,15 @@ TEST(8_SelectInteracting) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (103, 0)), e3r.selected_not_interacting (r2r)); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_edges_au8.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_edges_au8.gds"); } TEST(9_DRCChecks) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -507,7 +507,7 @@ TEST(9_DRCChecks) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (30, 0)), e6.enclosing_check (e4, 100, db::EdgesCheckOptions (true, db::Projection, 90, 0))); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_edges_au9.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_edges_au9.gds"); } } @@ -515,8 +515,8 @@ TEST(10_PullInteracting) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -587,6 +587,6 @@ TEST(10_PullInteracting) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (29, 0)), o); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_edges_au10.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_edges_au10.gds"); } diff --git a/src/db/unit_tests/dbDeepRegionTests.cc b/src/db/unit_tests/dbDeepRegionTests.cc index bccfefbaa..c5f7703a1 100644 --- a/src/db/unit_tests/dbDeepRegionTests.cc +++ b/src/db/unit_tests/dbDeepRegionTests.cc @@ -40,8 +40,8 @@ TEST(1_Basic) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -90,7 +90,7 @@ TEST(1_Basic) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au1.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au1.gds"); // some operations unsigned int l2 = ly.get_layer (db::LayerProperties (2, 0)); @@ -117,8 +117,8 @@ TEST(2) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -152,15 +152,15 @@ TEST(2) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au2.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au2.gds"); } TEST(3_BoolAndNot) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -229,7 +229,7 @@ TEST(3_BoolAndNot) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (25, 0)), r42and42); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au3.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au3.gds"); } { @@ -251,7 +251,7 @@ TEST(3_BoolAndNot) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (25, 0)), tr42and42); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au3b.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au3b.gds"); } } @@ -259,8 +259,8 @@ TEST(4_Add) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -305,7 +305,7 @@ TEST(4_Add) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (31, 0)), rnew42); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au4a.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au4a.gds"); } // inter-layout @@ -322,7 +322,7 @@ TEST(4_Add) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (21, 0)), r2 + box); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au4b.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au4b.gds"); } } @@ -330,8 +330,8 @@ TEST(5_BoolXOR) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -371,15 +371,15 @@ TEST(5_BoolXOR) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (15, 0)), r42xor42); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au5.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au5.gds"); } TEST(6_Reduction) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -422,15 +422,15 @@ TEST(6_Reduction) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (15, 0)), r42xor42); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au6.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au6.gds"); } TEST(7_Merge) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -464,15 +464,15 @@ TEST(7_Merge) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (13, 0)), r6_merged_minwc); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au7.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au7.gds"); } TEST(8_AreaAndPerimeter) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -503,8 +503,8 @@ TEST(9_SizingSimple) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -539,15 +539,15 @@ TEST(9_SizingSimple) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (14, 0)), r6_sized_aniso_plus); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au9a.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au9a.gds"); } TEST(9_SizingWithScaleVariants) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -578,15 +578,15 @@ TEST(9_SizingWithScaleVariants) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (10, 0)), r1b.merged ()); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au9b.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au9b.gds"); } TEST(9_SizingWithScaleAndXYVariants) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -619,7 +619,7 @@ TEST(9_SizingWithScaleAndXYVariants) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (10, 0)), r1b.merged ()); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au9c.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au9c.gds"); // merge back to original - this challenges the ability to map back the variants @@ -627,15 +627,15 @@ TEST(9_SizingWithScaleAndXYVariants) ly.insert (top_cell_index, ly.get_layer (db::LayerProperties (12, 0)), r1_sized_aniso); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/deep_region_au9d.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/deep_region_au9d.gds"); } TEST(9_SizingWithBoolean) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -665,15 +665,15 @@ TEST(9_SizingWithBoolean) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (12, 0)), r1_sized_aniso); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au9e.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au9e.gds"); } TEST(10_HullsAndHoles) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -705,15 +705,15 @@ TEST(10_HullsAndHoles) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (12, 0)), holes); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au10.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au10.gds"); } TEST(11_RoundAndSmoothed) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -745,15 +745,15 @@ TEST(11_RoundAndSmoothed) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (13, 0)), smoothed_keep_hv); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au11.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au11.gds"); } TEST(12_GridSnap) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -777,15 +777,15 @@ TEST(12_GridSnap) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (11, 0)), r3snapped); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au12.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au12.gds"); } TEST(13_Edges) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -813,15 +813,15 @@ TEST(13_Edges) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (12, 0)), r3edges_filtered); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au13.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au13.gds"); } TEST(13b_Edges) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_edges.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_edges.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -853,15 +853,15 @@ TEST(13b_Edges) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (12, 0)), r2edges); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au13b.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au13b.gds"); } TEST(14_Interacting) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -955,7 +955,7 @@ TEST(14_Interacting) EXPECT_EQ (r2r.selected_interacting (r1r).is_merged (), false); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au14a.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au14a.gds"); } db::Edges r1e = r1.edges (); @@ -982,7 +982,7 @@ TEST(14_Interacting) EXPECT_EQ (r6r.selected_interacting (r1er).is_merged (), false); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au14b.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au14b.gds"); } } @@ -990,8 +990,8 @@ TEST(15_Filtered) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1021,7 +1021,7 @@ TEST(15_Filtered) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (12, 0)), af1_else); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au15a.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au15a.gds"); } unsigned int l2 = ly.get_layer (db::LayerProperties (2, 0)); @@ -1041,7 +1041,7 @@ TEST(15_Filtered) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (12, 0)), r2_bhf); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au15b.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au15b.gds"); } } @@ -1049,8 +1049,8 @@ TEST(16_MergeWithMinWC) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1081,7 +1081,7 @@ TEST(16_MergeWithMinWC) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (12, 0)), r1_merged_wc2); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au16.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au16.gds"); } } @@ -1089,8 +1089,8 @@ TEST(17_SinglePolygonChecks) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1123,7 +1123,7 @@ TEST(17_SinglePolygonChecks) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (20, 0)), r6.notch_check (1300, db::RegionCheckOptions (false, db::Euclidian, 90, 0))); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au17.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au17.gds"); } } @@ -1131,8 +1131,8 @@ TEST(18_MultiPolygonChecks) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1167,7 +1167,7 @@ TEST(18_MultiPolygonChecks) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (30, 0)), r6.enclosing_check (r4, 100, db::RegionCheckOptions (true, db::Projection, 90, 0))); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au18.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au18.gds"); } } @@ -1175,8 +1175,8 @@ TEST(19_GridCheck) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1203,15 +1203,15 @@ TEST(19_GridCheck) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (12, 0)), r3_gc2); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au19.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au19.gds"); } TEST(20_AngleCheck) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/angle_check_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/angle_check_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1236,15 +1236,15 @@ TEST(20_AngleCheck) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (3, 0)), ep1_ac2); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au20.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au20.gds"); } TEST(21_Processors) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1287,15 +1287,15 @@ TEST(21_Processors) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (42, 0)), r1.processed (db::ConvexDecomposition (db::PO_horizontal))); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au21.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au21.gds"); } TEST(22_TwoLayoutsWithDifferentDBU) { db::Layout ly1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly1); @@ -1306,8 +1306,8 @@ TEST(22_TwoLayoutsWithDifferentDBU) db::Layout ly2; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_area_peri_l1_dbu2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_area_peri_l1_dbu2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly2); @@ -1330,15 +1330,15 @@ TEST(22_TwoLayoutsWithDifferentDBU) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (1, 0)), r11.sized (1000) ^ r12); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au22.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au22.gds"); } TEST(23_Texts) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1380,7 +1380,7 @@ TEST(23_Texts) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (23, 0)), rf8dots); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au23.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au23.gds"); } } @@ -1388,8 +1388,8 @@ TEST(24_TextsFromDeep) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1433,7 +1433,7 @@ TEST(24_TextsFromDeep) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (23, 0)), rf8dots); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au24.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au24.gds"); } } @@ -1441,8 +1441,8 @@ TEST(25_Pull) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1505,7 +1505,7 @@ TEST(25_Pull) EXPECT_EQ (r2r.pull_interacting (r6r).is_merged (), false); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au25a.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au25a.gds"); } db::Edges r1e = r1.edges (); @@ -1543,7 +1543,7 @@ TEST(25_Pull) EXPECT_EQ (r6.pull_interacting (r1er).is_merged (), false); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au25b.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au25b.gds"); } } @@ -1551,8 +1551,8 @@ TEST(26_BreakoutCells) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l26.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l26.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1582,15 +1582,15 @@ TEST(26_BreakoutCells) ly.insert (top_cell.cell_index (), ly.get_layer (db::LayerProperties (103, 0)), r2m1); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/deep_region_au26.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/deep_region_au26.gds"); } TEST(27a_snap) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/scale_and_snap.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/scale_and_snap.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1609,15 +1609,15 @@ TEST(27a_snap) r2.insert_into (&ly, top_cell_index, ly.get_layer (db::LayerProperties (100, 0))); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/deep_region_au27.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/deep_region_au27.gds"); } TEST(27b_snap) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/scale_and_snap.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/scale_and_snap.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1636,15 +1636,15 @@ TEST(27b_snap) r1.insert_into (&ly, top_cell_index, ly.get_layer (db::LayerProperties (100, 0))); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/deep_region_au27.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/deep_region_au27.gds"); } TEST(28a_snap) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/scale_and_snap.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/scale_and_snap.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1663,15 +1663,15 @@ TEST(28a_snap) r2.insert_into (&ly, top_cell_index, ly.get_layer (db::LayerProperties (100, 0))); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/deep_region_au28.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/deep_region_au28.gds"); } TEST(28b_snap) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/scale_and_snap.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/scale_and_snap.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1690,15 +1690,15 @@ TEST(28b_snap) r1.insert_into (&ly, top_cell_index, ly.get_layer (db::LayerProperties (100, 0))); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/deep_region_au28.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/deep_region_au28.gds"); } TEST(29_InteractionsWithTexts) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_texts_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_texts_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1743,7 +1743,7 @@ TEST(29_InteractionsWithTexts) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au29.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au29.gds"); } TEST(30a_interact_with_count_region) @@ -2022,8 +2022,8 @@ TEST(100_Integration) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/vexriscv_clocked_r.oas.gz"; + std::string fn (tl::testdata ()); + fn += "/algo/vexriscv_clocked_r.oas.gz"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -2101,15 +2101,15 @@ TEST(100_Integration) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (105, 0)), diff_cont); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au100.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au100.gds"); } TEST(101_DeepFlatCollaboration) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_region_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_region_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -2138,7 +2138,7 @@ TEST(101_DeepFlatCollaboration) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (11, 0)), r2minus3f); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_region_au101.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_region_au101.gds"); } TEST(issue_277) @@ -2173,8 +2173,8 @@ TEST(issue_400) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/gds/t10.gds"; + std::string fn (tl::testdata ()); + fn += "/gds/t10.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -2201,15 +2201,15 @@ TEST(issue_400) } CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/deep_region_au400a.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/deep_region_au400a.gds"); } TEST(issue_400_dont_keep_regions) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/gds/t10.gds"; + std::string fn (tl::testdata ()); + fn += "/gds/t10.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -2234,15 +2234,15 @@ TEST(issue_400_dont_keep_regions) } CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/deep_region_au400b.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/deep_region_au400b.gds"); } TEST(issue_400_with_region) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/gds/t10.gds"; + std::string fn (tl::testdata ()); + fn += "/gds/t10.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -2269,15 +2269,15 @@ TEST(issue_400_with_region) } CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/deep_region_au400c.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/deep_region_au400c.gds"); } TEST(issue_663_separation_from_inside) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/issue-663.oas.gz"; + std::string fn (tl::testdata ()); + fn += "/algo/issue-663.oas.gz"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -2306,5 +2306,5 @@ TEST(issue_663_separation_from_inside) ep_deep.insert_into_as_polygons (&ly, top_cell_index, l11, 0); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/deep_region_au663.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/deep_region_au663.gds"); } diff --git a/src/db/unit_tests/dbDeepTextsTests.cc b/src/db/unit_tests/dbDeepTextsTests.cc index 45364fdee..e5b973cad 100644 --- a/src/db/unit_tests/dbDeepTextsTests.cc +++ b/src/db/unit_tests/dbDeepTextsTests.cc @@ -36,8 +36,8 @@ TEST(1_Basics) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_texts_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_texts_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -83,15 +83,15 @@ TEST(1_Basics) texts2_copy.insert_into_as_polygons (&target, target_top_cell_index, target.get_layer (db::LayerProperties (14, 0)), 1); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_texts_au1.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_texts_au1.gds"); } TEST(2_Interactions) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_texts_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_texts_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -143,15 +143,15 @@ TEST(2_Interactions) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_texts_au2.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_texts_au2.gds"); } TEST(3_Filtering) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/deep_texts_l3.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/deep_texts_l3.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -177,5 +177,5 @@ TEST(3_Filtering) target.insert (target_top_cell_index, target.get_layer (db::LayerProperties (13, 0)), texts2); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/deep_texts_au3.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/deep_texts_au3.gds"); } diff --git a/src/db/unit_tests/dbEdgeProcessorTests.cc b/src/db/unit_tests/dbEdgeProcessorTests.cc index 82ce06a5b..e4c823dce 100644 --- a/src/db/unit_tests/dbEdgeProcessorTests.cc +++ b/src/db/unit_tests/dbEdgeProcessorTests.cc @@ -47,8 +47,8 @@ void run_test_bool (tl::TestBase *_this, const char *file, int mode, bool min_co db::Layout layout_org; { - std::string fn (tl::testsrc ()); - fn += "/testdata/bool/"; + std::string fn (tl::testdata ()); + fn += "/bool/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -78,12 +78,12 @@ void run_test_bool (tl::TestBase *_this, const char *file, int mode, bool min_co reader.read (layout_org, options); } - std::string au_fn1 (tl::testsrc ()); - au_fn1 += "/testdata/bool/"; + std::string au_fn1 (tl::testdata ()); + au_fn1 += "/bool/"; au_fn1 += au_file1 ? au_file1 : file; - std::string au_fn2 (tl::testsrc ()); - au_fn2 += "/testdata/bool/"; + std::string au_fn2 (tl::testdata ()); + au_fn2 += "/bool/"; au_fn2 += au_file2 ? au_file2 : (au_file1 ? au_file1 : file); int la = -1; @@ -169,8 +169,8 @@ void run_test_bool (tl::TestBase *_this, const char *file, int mode, bool min_co // Use this opportunity to test trapezoid decomposition if (au_file3) { - std::string au_fn3 (tl::testsrc ()); - au_fn3 += "/testdata/bool/"; + std::string au_fn3 (tl::testdata ()); + au_fn3 += "/bool/"; au_fn3 += au_file3; db::EdgeProcessor ep; @@ -424,8 +424,8 @@ void run_test_size (tl::TestBase *_this, const char *file, const char *au_file, db::Layout layout_au (&m); { - std::string fn (tl::testsrc ()); - fn += "/testdata/bool/"; + std::string fn (tl::testdata ()); + fn += "/bool/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -450,8 +450,8 @@ void run_test_size (tl::TestBase *_this, const char *file, const char *au_file, reader.read (layout_org, options); } - std::string au_fn (tl::testsrc ()); - au_fn += "/testdata/bool/"; + std::string au_fn (tl::testdata ()); + au_fn += "/bool/"; au_fn += au_file; int la = -1; @@ -508,8 +508,8 @@ void run_test_twobool (tl::TestBase *_this, const char *file, const char *au_fil db::Layout layout_au (&m); { - std::string fn (tl::testsrc ()); - fn += "/testdata/bool/"; + std::string fn (tl::testdata ()); + fn += "/bool/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -544,8 +544,8 @@ void run_test_twobool (tl::TestBase *_this, const char *file, const char *au_fil reader.read (layout_org, options); } - std::string au_fn (tl::testsrc ()); - au_fn += "/testdata/bool/"; + std::string au_fn (tl::testdata ()); + au_fn += "/bool/"; au_fn += au_file; int la = -1; @@ -2349,8 +2349,8 @@ TEST(100) unsigned int l2_l1d0 = 0, l2_l2d0 = 0; { - std::string fn (tl::testsrc ()); - fn += "/testdata/bool/"; + std::string fn (tl::testdata ()); + fn += "/bool/"; fn += "sp1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); @@ -2375,8 +2375,8 @@ TEST(100) } { - std::string fn (tl::testsrc ()); - fn += "/testdata/bool/"; + std::string fn (tl::testdata ()); + fn += "/bool/"; fn += "sp2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); @@ -2448,8 +2448,8 @@ TEST(100) proc.merge (layout_1, layout_1.cell (*layout_1.begin_top_down ()), l1_l1d0, lr_top->shapes (lr_l123d0), false /*hierarchical*/, 1, true /*resolve holes*/, true /*min coherence*/); - std::string au_fn (tl::testsrc ()); - au_fn += "/testdata/bool/"; + std::string au_fn (tl::testdata ()); + au_fn += "/bool/"; au_fn += "sp_au.gds"; db::compare_layouts (_this, lr, au_fn); diff --git a/src/db/unit_tests/dbFillToolTests.cc b/src/db/unit_tests/dbFillToolTests.cc index b7857ccd5..1c08d7539 100644 --- a/src/db/unit_tests/dbFillToolTests.cc +++ b/src/db/unit_tests/dbFillToolTests.cc @@ -33,8 +33,8 @@ TEST(1) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/fill_tool1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/fill_tool1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -49,15 +49,15 @@ TEST(1) db::fill_region (&ly.cell (top_cell), fill_region, fill_cell, ly.cell (fill_cell).bbox (), db::Point (), false); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/fill_tool_au1.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/fill_tool_au1.gds"); } TEST(2) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/fill_tool2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/fill_tool2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -79,15 +79,15 @@ TEST(2) remaining_polygons.insert_into (&ly, top_cell, l101); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/fill_tool_au2.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/fill_tool_au2.gds"); } TEST(3) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/fill_tool3.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/fill_tool3.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -113,15 +113,15 @@ TEST(3) remaining_polygons.insert_into (&ly, top_cell, l101); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/fill_tool_au3.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/fill_tool_au3.gds"); } TEST(3a) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/fill_tool3.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/fill_tool3.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -147,15 +147,15 @@ TEST(3a) remaining_polygons.insert_into (&ly, top_cell, l101); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/fill_tool_au3a.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/fill_tool_au3a.gds"); } TEST(3b) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/fill_tool3.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/fill_tool3.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -181,15 +181,15 @@ TEST(3b) remaining_polygons.insert_into (&ly, top_cell, l101); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/fill_tool_au3b.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/fill_tool_au3b.gds"); } TEST(3c) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/fill_tool3.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/fill_tool3.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -215,15 +215,15 @@ TEST(3c) remaining_polygons.insert_into (&ly, top_cell, l101); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/fill_tool_au3c.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/fill_tool_au3c.gds"); } TEST(4) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/fill_tool4.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/fill_tool4.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -247,15 +247,15 @@ TEST(4) remaining_polygons.insert_into (&ly, top_cell, l101); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/fill_tool_au4.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/fill_tool_au4.gds"); } TEST(4b) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/fill_tool4.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/fill_tool4.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -279,15 +279,15 @@ TEST(4b) remaining_polygons.insert_into (&ly, top_cell, l101); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/fill_tool_au4b.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/fill_tool_au4b.gds"); } TEST(4c) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/fill_tool4.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/fill_tool4.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -311,5 +311,5 @@ TEST(4c) remaining_polygons.insert_into (&ly, top_cell, l101); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/fill_tool_au4c.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/fill_tool_au4c.gds"); } diff --git a/src/db/unit_tests/dbHierNetworkProcessorTests.cc b/src/db/unit_tests/dbHierNetworkProcessorTests.cc index 4edcbaf5d..925de8ab9 100644 --- a/src/db/unit_tests/dbHierNetworkProcessorTests.cc +++ b/src/db/unit_tests/dbHierNetworkProcessorTests.cc @@ -987,8 +987,8 @@ static void run_hc_test (tl::TestBase *_this, const std::string &file, const std options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/"; + std::string fn (tl::testdata ()); + fn += "/algo/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -1074,7 +1074,7 @@ static void run_hc_test (tl::TestBase *_this, const std::string &file, const std } CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/" + au_file); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/" + au_file); } static void run_hc_test_with_backannotation (tl::TestBase *_this, const std::string &file, const std::string &au_file) @@ -1120,8 +1120,8 @@ static void run_hc_test_with_backannotation (tl::TestBase *_this, const std::str options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/"; + std::string fn (tl::testdata ()); + fn += "/algo/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -1165,7 +1165,7 @@ static void run_hc_test_with_backannotation (tl::TestBase *_this, const std::str hc.return_to_hierarchy (ly, lm); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/" + au_file); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/" + au_file); } TEST(101_HierClusters) @@ -1323,8 +1323,8 @@ TEST(200_issue609) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/issue-609.oas.gz"; + std::string fn (tl::testdata ()); + fn += "/algo/issue-609.oas.gz"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly, options); diff --git a/src/db/unit_tests/dbHierProcessorTests.cc b/src/db/unit_tests/dbHierProcessorTests.cc index 7ae753deb..442ed5ee8 100644 --- a/src/db/unit_tests/dbHierProcessorTests.cc +++ b/src/db/unit_tests/dbHierProcessorTests.cc @@ -34,7 +34,7 @@ static std::string testdata (const std::string &fn) { - return tl::testsrc () + "/testdata/algo/" + fn; + return tl::testdata () + "/algo/" + fn; } enum TestMode diff --git a/src/db/unit_tests/dbHierarchyBuilderTests.cc b/src/db/unit_tests/dbHierarchyBuilderTests.cc index d000c0cb3..0a9511dde 100644 --- a/src/db/unit_tests/dbHierarchyBuilderTests.cc +++ b/src/db/unit_tests/dbHierarchyBuilderTests.cc @@ -32,8 +32,8 @@ TEST(1) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -56,15 +56,15 @@ TEST(1) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au1.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au1.gds"); } TEST(1_WithEmptyLayer) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -91,15 +91,15 @@ TEST(1_WithEmptyLayer) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au1.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au1.gds"); } TEST(2_WithoutClip) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -128,15 +128,15 @@ TEST(2_WithoutClip) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au2a.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au2a.gds"); } TEST(2_WithClip) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -166,15 +166,15 @@ TEST(2_WithClip) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au2b.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au2b.gds"); } TEST(2_WithClipAndSimplification) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -205,15 +205,15 @@ TEST(2_WithClipAndSimplification) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au2c.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au2c.gds"); } TEST(2_WithClipAndRefGeneration) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -244,15 +244,15 @@ TEST(2_WithClipAndRefGeneration) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au2d.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au2d.gds"); } TEST(2_WithEmptyResult) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -283,15 +283,15 @@ TEST(2_WithEmptyResult) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au2e.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au2e.gds"); } TEST(2_WithClipAndSimplificationAndEmptyLayer) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -333,15 +333,15 @@ TEST(2_WithClipAndSimplificationAndEmptyLayer) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au2f.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au2f.gds"); } TEST(3_ComplexRegionWithClip) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -375,15 +375,15 @@ TEST(3_ComplexRegionWithClip) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au3a.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au3a.gds"); } TEST(4_ComplexRegionAndLayoutWithClip) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l3.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l3.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -417,7 +417,7 @@ TEST(4_ComplexRegionAndLayoutWithClip) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au4a.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au4a.gds"); } TEST(5_CompareRecursiveShapeIterators) @@ -556,8 +556,8 @@ TEST(6_DisjunctLayersPerHierarchyBranch) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l4.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l4.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -580,7 +580,7 @@ TEST(6_DisjunctLayersPerHierarchyBranch) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au_l4.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au_l4.gds"); } TEST(7_DetachFromOriginalLayout) @@ -590,8 +590,8 @@ TEST(7_DetachFromOriginalLayout) // translated or resolved in the hierarchy builder. std::unique_ptr ly (new db::Layout (false)); { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l5.oas.gz"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l5.oas.gz"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (*ly); @@ -617,15 +617,15 @@ TEST(7_DetachFromOriginalLayout) ly.reset (0); CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au_l5.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au_l5.gds"); } TEST(8a_SimpleWithTrans) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -648,15 +648,15 @@ TEST(8a_SimpleWithTrans) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au8a.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au8a.gds"); } TEST(8b_ComplexRegionWithTransformation) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/hierarchy_builder_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/hierarchy_builder_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -690,6 +690,6 @@ TEST(8b_ComplexRegionWithTransformation) } CHECKPOINT(); - db::compare_layouts (_this, target, tl::testsrc () + "/testdata/algo/hierarchy_builder_au8b.gds"); + db::compare_layouts (_this, target, tl::testdata () + "/algo/hierarchy_builder_au8b.gds"); } diff --git a/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc b/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc index 2b98222ed..5dfa04789 100644 --- a/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc +++ b/src/db/unit_tests/dbLayoutToNetlistReaderTests.cc @@ -36,7 +36,7 @@ TEST(1_ReaderBasic) { db::LayoutToNetlist l2n; - std::string in_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_reader_in.txt"); + std::string in_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_in.txt"); tl::InputStream is_in (in_path); db::LayoutToNetlistStandardReader reader (is_in); @@ -51,7 +51,7 @@ TEST(1_ReaderBasic) writer.write (&l2n); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_reader_in.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_in.txt"); compare_text_files (path, au_path); @@ -76,8 +76,7 @@ TEST(1_ReaderBasic) l2n.build_all_nets (cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_Disconnected, 0, "DEVICE_"); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "l2n_reader_au_1.gds"); @@ -107,8 +106,7 @@ TEST(1_ReaderBasic) l2n.build_nets (&nets, cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_Disconnected, 0, "DEVICE_"); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "l2n_reader_au_1b.gds"); @@ -138,8 +136,7 @@ TEST(1_ReaderBasic) l2n.build_nets (&nets, cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_Flatten, 0, "DEVICE_"); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "l2n_reader_au_1c.gds"); @@ -169,8 +166,7 @@ TEST(1_ReaderBasic) l2n.build_nets (&nets, cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_SubcircuitCells, "CIRCUIT_", "DEVICE_"); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "l2n_reader_au_1d.gds"); @@ -201,8 +197,7 @@ TEST(1_ReaderBasic) l2n.build_nets (&nets, cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_SubcircuitCells, "CIRCUIT_", 0); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "l2n_reader_au_1e.gds"); @@ -233,8 +228,7 @@ TEST(1_ReaderBasic) l2n.build_nets (&nets, cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_SubcircuitCells, "CIRCUIT_", "DEVICE_"); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "l2n_reader_au_1f.gds"); @@ -246,7 +240,7 @@ TEST(1b_ReaderBasicShort) { db::LayoutToNetlist l2n; - std::string in_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_reader_in_s.txt"); + std::string in_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_in_s.txt"); tl::InputStream is_in (in_path); db::LayoutToNetlistStandardReader reader (is_in); @@ -261,7 +255,7 @@ TEST(1b_ReaderBasicShort) writer.write (&l2n); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_reader_in_s.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_in_s.txt"); compare_text_files (path, au_path); } @@ -270,7 +264,7 @@ TEST(1c_ReaderBasicShortWithProps) { db::LayoutToNetlist l2n; - std::string in_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_reader_in_p.txt"); + std::string in_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_in_p.txt"); tl::InputStream is_in (in_path); db::LayoutToNetlistStandardReader reader (is_in); @@ -285,7 +279,7 @@ TEST(1c_ReaderBasicShortWithProps) writer.write (&l2n); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_reader_in_p.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_in_p.txt"); compare_text_files (path, au_path); @@ -311,8 +305,7 @@ TEST(1c_ReaderBasicShortWithProps) l2n.build_all_nets (cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_Disconnected, 0, "DEVICE_"); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "l2n_reader_au_p.oas"); @@ -324,7 +317,7 @@ TEST(2_ReaderWithGlobalNets) { db::LayoutToNetlist l2n; - std::string in_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_reader_au.txt"); + std::string in_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_au.txt"); tl::InputStream is_in (in_path); db::LayoutToNetlistStandardReader reader (is_in); @@ -339,7 +332,7 @@ TEST(2_ReaderWithGlobalNets) writer.write (&l2n); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_reader_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_au.txt"); compare_text_files (path, au_path); @@ -368,8 +361,7 @@ TEST(2_ReaderWithGlobalNets) l2n.build_all_nets (cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_SubcircuitCells, "CIRCUIT_", "DEVICE_"); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "l2n_reader_au_2r.gds"); @@ -381,7 +373,7 @@ TEST(3_ReaderAbsoluteCoordinates) { db::LayoutToNetlist l2n; - std::string in_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_reader_au_abs.txt"); + std::string in_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_au_abs.txt"); tl::InputStream is_in (in_path); db::LayoutToNetlistStandardReader reader (is_in); @@ -396,7 +388,7 @@ TEST(3_ReaderAbsoluteCoordinates) writer.write (&l2n); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_reader_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_au.txt"); compare_text_files (path, au_path); @@ -425,8 +417,7 @@ TEST(3_ReaderAbsoluteCoordinates) l2n.build_all_nets (cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_SubcircuitCells, "CIRCUIT_", "DEVICE_"); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "l2n_reader_au_2r.gds"); @@ -440,7 +431,7 @@ TEST(4_ReaderCombinedDevices) // build from: testdata/algo/l2n_reader_4.gds - std::string in_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_reader_4.l2n"); + std::string in_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_4.l2n"); tl::InputStream is_in (in_path); db::LayoutToNetlistStandardReader reader (is_in); @@ -455,7 +446,7 @@ TEST(4_ReaderCombinedDevices) writer.write (&l2n); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_reader_au_4.l2n"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_reader_au_4.l2n"); compare_text_files (path, au_path); @@ -472,8 +463,7 @@ TEST(4_ReaderCombinedDevices) l2n.build_all_nets (cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_SubcircuitCells, "CIRCUIT_", "DEVICE_"); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "l2n_reader_au_4.gds"); diff --git a/src/db/unit_tests/dbLayoutToNetlistTests.cc b/src/db/unit_tests/dbLayoutToNetlistTests.cc index 3e05c7e97..155a371fd 100644 --- a/src/db/unit_tests/dbLayoutToNetlistTests.cc +++ b/src/db/unit_tests/dbLayoutToNetlistTests.cc @@ -189,8 +189,7 @@ TEST(1_BasicExtraction) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l1.gds"); @@ -329,8 +328,7 @@ TEST(1_BasicExtraction) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1_with_rec_nets.gds"); @@ -399,8 +397,7 @@ TEST(1_BasicExtraction) l2n.build_all_nets (cm, ly2, lmap, 0, tl::Variant (), db::LayoutToNetlist::BNH_Disconnected, 0, 0); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1_rebuild_ff.gds"); @@ -426,8 +423,7 @@ TEST(1_BasicExtraction) l2n.build_all_nets (cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_Disconnected, 0, 0); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1_rebuild_nf.gds"); @@ -453,8 +449,7 @@ TEST(1_BasicExtraction) l2n.build_all_nets (cm, ly2, lmap, 0, tl::Variant (), db::LayoutToNetlist::BNH_SubcircuitCells, "CIRCUIT_", 0); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1_rebuild_fr.gds"); @@ -480,8 +475,7 @@ TEST(1_BasicExtraction) l2n.build_all_nets (cm, ly2, lmap, 0, tl::Variant (42), db::LayoutToNetlist::BNH_Flatten, 0, 0); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1_rebuild_pf.gds"); @@ -507,8 +501,7 @@ TEST(1_BasicExtraction) l2n.build_all_nets (cm, ly2, lmap, 0, tl::Variant (42), db::LayoutToNetlist::BNH_SubcircuitCells, "CIRCUIT_", 0); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1_rebuild_pr.gds"); @@ -534,8 +527,7 @@ TEST(1_BasicExtraction) l2n.build_all_nets (cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_SubcircuitCells, "CIRCUIT_", "DEVICE_"); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1_rebuild_nr.gds"); @@ -646,8 +638,7 @@ TEST(1_BasicExtraction) l2n.build_all_nets (cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_SubcircuitCells, "CIRCUIT_", "DEVICE_"); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1_joined_nets.gds"); @@ -677,8 +668,7 @@ TEST(2_Probing) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l2.gds"); @@ -842,8 +832,7 @@ TEST(2_Probing) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au2_with_rec_nets.gds"); @@ -929,8 +918,7 @@ TEST(3_GlobalNetConnections) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l3.gds"); @@ -1122,8 +1110,7 @@ TEST(3_GlobalNetConnections) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au3_with_rec_nets.gds"); @@ -1209,8 +1196,7 @@ TEST(4_GlobalNetDeviceExtraction) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l3.gds"); @@ -1408,8 +1394,7 @@ TEST(4_GlobalNetDeviceExtraction) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au4_with_rec_nets.gds"); @@ -1495,8 +1480,7 @@ TEST(5_DeviceExtractionWithDeviceCombination) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l5.gds"); @@ -1694,8 +1678,7 @@ TEST(5_DeviceExtractionWithDeviceCombination) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au5_with_rec_nets.gds"); @@ -1773,8 +1756,7 @@ TEST(6_MoreDeviceTypes) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l6.gds"); @@ -1930,8 +1912,7 @@ TEST(7_MoreByEmptyDeviceTypes) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l6.gds"); @@ -2087,8 +2068,7 @@ TEST(8_FlatExtraction) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l6.gds"); @@ -2266,8 +2246,7 @@ TEST(9_FlatExtractionWithExternalDSS) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l6.gds"); @@ -2443,8 +2422,7 @@ TEST(10_Antenna) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "antenna_l1.gds"); @@ -2691,8 +2669,7 @@ TEST(10_Antenna) b6_9.insert_into (&ly2, top2.cell_index (), ly2.insert_layer (db::LayerProperties (652, 0))); } - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "antenna_au1.gds"); @@ -2721,8 +2698,7 @@ TEST(11_DuplicateInstances) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l1_dup_inst.gds"); @@ -2861,8 +2837,7 @@ TEST(11_DuplicateInstances) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1_dup_inst_with_rec_nets.gds"); @@ -2926,8 +2901,7 @@ TEST(12_FlattenCircuitDoesFlattenLayout) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l5.gds"); @@ -3148,8 +3122,7 @@ TEST(12_FlattenCircuitDoesFlattenLayout) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au5_flattened_circuits.gds"); @@ -3180,8 +3153,7 @@ TEST(13_JoinNetNames) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l13.gds"); @@ -3378,8 +3350,7 @@ TEST(13_JoinNetNames) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au13_circuits.gds"); @@ -3412,8 +3383,7 @@ TEST(14_JoinNets) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l14.gds"); @@ -3624,8 +3594,7 @@ TEST(14_JoinNets) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au14_circuits.gds"); diff --git a/src/db/unit_tests/dbLayoutToNetlistWriterTests.cc b/src/db/unit_tests/dbLayoutToNetlistWriterTests.cc index a5f6f9189..137fb4785 100644 --- a/src/db/unit_tests/dbLayoutToNetlistWriterTests.cc +++ b/src/db/unit_tests/dbLayoutToNetlistWriterTests.cc @@ -60,8 +60,7 @@ TEST(1_WriterBasic) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l1.gds"); @@ -174,7 +173,7 @@ TEST(1_WriterBasic) writer.write (&l2n); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_writer_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_writer_au.txt"); compare_text_files (path, au_path); @@ -185,7 +184,7 @@ TEST(1_WriterBasic) writer.write (&l2n); } - au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_writer_au_s.txt"); + au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_writer_au_s.txt"); compare_text_files (path, au_path); @@ -210,8 +209,7 @@ TEST(1_WriterBasic) l2n.build_all_nets (cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_Disconnected, 0, "DEVICE_"); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "l2n_writer_au.gds"); @@ -241,7 +239,7 @@ TEST(1_WriterBasic) writer.write (&l2n); } - au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_writer_au_p.txt"); + au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_writer_au_p.txt"); compare_text_files (path, au_path); } @@ -270,8 +268,7 @@ TEST(2_WriterWithGlobalNets) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l3.gds"); @@ -405,7 +402,7 @@ TEST(2_WriterWithGlobalNets) writer.write (&l2n); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_writer_au_2b.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_writer_au_2b.txt"); compare_text_files (path, au_path); @@ -416,7 +413,7 @@ TEST(2_WriterWithGlobalNets) writer.write (&l2n); } - au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "l2n_writer_au_2s.txt"); + au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "l2n_writer_au_2s.txt"); compare_text_files (path, au_path); @@ -445,8 +442,7 @@ TEST(2_WriterWithGlobalNets) l2n.build_all_nets (cm, ly2, lmap, "NET_", tl::Variant (), db::LayoutToNetlist::BNH_SubcircuitCells, "CIRCUIT_", "DEVICE_"); - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "l2n_writer_au_2.gds"); diff --git a/src/db/unit_tests/dbLayoutUtilsTests.cc b/src/db/unit_tests/dbLayoutUtilsTests.cc index ebfe98140..1d39e56eb 100644 --- a/src/db/unit_tests/dbLayoutUtilsTests.cc +++ b/src/db/unit_tests/dbLayoutUtilsTests.cc @@ -42,8 +42,8 @@ TEST(1) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -51,8 +51,8 @@ TEST(1) db::Layout l2; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l2); @@ -97,8 +97,8 @@ TEST(2) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -106,8 +106,8 @@ TEST(2) db::Layout l2; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l2); @@ -129,7 +129,7 @@ TEST(2) db::merge_layouts (l2, l1, db::ICplxTrans (), src, cm.table (), lm.table (), &fm); CHECKPOINT(); - db::compare_layouts (_this, l2, tl::testsrc () + "/testdata/algo/layout_utils_au2.gds"); + db::compare_layouts (_this, l2, tl::testdata () + "/algo/layout_utils_au2.gds"); EXPECT_EQ (fm.find (l1.cell_by_name ("TOP").second) != fm.end (), true); EXPECT_EQ (l2.cell_name (fm.find (l1.cell_by_name ("TOP").second)->second), "TOP$1"); @@ -146,8 +146,8 @@ TEST(3) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -155,8 +155,8 @@ TEST(3) db::Layout l2; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l2); @@ -179,7 +179,7 @@ TEST(3) db::merge_layouts (l2, l1, db::ICplxTrans (), src, cm.table (), lm.table (), &fm); CHECKPOINT(); - db::compare_layouts (_this, l2, tl::testsrc () + "/testdata/algo/layout_utils_au3.gds"); + db::compare_layouts (_this, l2, tl::testdata () + "/algo/layout_utils_au3.gds"); EXPECT_EQ (fm.find (l1.cell_by_name ("TOP").second) != fm.end (), true); EXPECT_EQ (l2.cell_name (fm.find (l1.cell_by_name ("TOP").second)->second), "TOPTOP"); @@ -196,8 +196,8 @@ TEST(4) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -205,8 +205,8 @@ TEST(4) db::Layout l2; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l2); @@ -229,7 +229,7 @@ TEST(4) db::merge_layouts (l2, l1, db::ICplxTrans (), src, cm.table (), lm.table (), &fm); CHECKPOINT(); - db::compare_layouts (_this, l2, tl::testsrc () + "/testdata/algo/layout_utils_au4.gds"); + db::compare_layouts (_this, l2, tl::testdata () + "/algo/layout_utils_au4.gds"); EXPECT_EQ (fm.find (l1.cell_by_name ("TOP").second) != fm.end (), true); EXPECT_EQ (l2.cell_name (fm.find (l1.cell_by_name ("TOP").second)->second), "TOP"); @@ -246,8 +246,8 @@ TEST(5) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -255,8 +255,8 @@ TEST(5) db::Layout l2; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l2); @@ -279,7 +279,7 @@ TEST(5) db::merge_layouts (l2, l1, db::ICplxTrans (), src, cm.table (), lm.table (), &fm); CHECKPOINT(); - db::compare_layouts (_this, l2, tl::testsrc () + "/testdata/algo/layout_utils_au5.gds"); + db::compare_layouts (_this, l2, tl::testdata () + "/algo/layout_utils_au5.gds"); EXPECT_EQ (fm.find (l1.cell_by_name ("TOP").second) != fm.end (), true); EXPECT_EQ (l2.cell_name (fm.find (l1.cell_by_name ("TOP").second)->second), "TOP"); @@ -296,8 +296,8 @@ TEST(6) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -305,8 +305,8 @@ TEST(6) db::Layout l2; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l2); @@ -332,7 +332,7 @@ TEST(6) db::merge_layouts (l2, l1, db::ICplxTrans (), src, cm.table (), lm.table (), &fm); CHECKPOINT(); - db::compare_layouts (_this, l2, tl::testsrc () + "/testdata/algo/layout_utils_au6.gds"); + db::compare_layouts (_this, l2, tl::testdata () + "/algo/layout_utils_au6.gds"); EXPECT_EQ (fm.find (l1.cell_by_name ("TOP").second) != fm.end (), true); EXPECT_EQ (l2.cell_name (fm.find (l1.cell_by_name ("TOP").second)->second), "TOP"); @@ -348,8 +348,8 @@ TEST(7) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -357,8 +357,8 @@ TEST(7) db::Layout l2; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l3.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l3.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l2); @@ -384,7 +384,7 @@ TEST(7) db::merge_layouts (l2, l1, db::ICplxTrans (4.0), src, cm.table (), lm.table (), &fm); CHECKPOINT(); - db::compare_layouts (_this, l2, tl::testsrc () + "/testdata/algo/layout_utils_au7.gds"); + db::compare_layouts (_this, l2, tl::testdata () + "/algo/layout_utils_au7.gds"); EXPECT_EQ (fm.find (l1.cell_by_name ("TOP").second) != fm.end (), true); EXPECT_EQ (l2.cell_name (fm.find (l1.cell_by_name ("TOP").second)->second), "TOP"); @@ -399,7 +399,7 @@ TEST(7) db::merge_layouts (l2copy, l1, db::ICplxTrans (4.0), src, cm.table (), lm.table ()); CHECKPOINT(); - db::compare_layouts (_this, l2copy, tl::testsrc () + "/testdata/algo/layout_utils_au7.gds"); + db::compare_layouts (_this, l2copy, tl::testdata () + "/algo/layout_utils_au7.gds"); } // Tests copy_shapes with no specific mapping (flattening) @@ -407,8 +407,8 @@ TEST(12) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -416,8 +416,8 @@ TEST(12) db::Layout l2; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l2); @@ -440,7 +440,7 @@ TEST(12) db::copy_shapes (l2, l1, db::ICplxTrans (), src, cm.table (), lm.table ()); CHECKPOINT(); - db::compare_layouts (_this, l2, tl::testsrc () + "/testdata/algo/layout_utils_au12.gds"); + db::compare_layouts (_this, l2, tl::testdata () + "/algo/layout_utils_au12.gds"); } // Tests copy_shapes with full name mapping @@ -448,8 +448,8 @@ TEST(13) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -457,8 +457,8 @@ TEST(13) db::Layout l2; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l2); @@ -480,7 +480,7 @@ TEST(13) db::copy_shapes (l2, l1, db::ICplxTrans (), src, cm.table (), lm.table ()); CHECKPOINT(); - db::compare_layouts (_this, l2, tl::testsrc () + "/testdata/algo/layout_utils_au13.gds"); + db::compare_layouts (_this, l2, tl::testdata () + "/algo/layout_utils_au13.gds"); } // Tests copy_shapes with geo mapping @@ -488,8 +488,8 @@ TEST(14) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -497,8 +497,8 @@ TEST(14) db::Layout l2; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l2); @@ -520,7 +520,7 @@ TEST(14) db::copy_shapes (l2, l1, db::ICplxTrans (), src, cm.table (), lm.table ()); CHECKPOINT(); - db::compare_layouts (_this, l2, tl::testsrc () + "/testdata/algo/layout_utils_au14.gds"); + db::compare_layouts (_this, l2, tl::testdata () + "/algo/layout_utils_au14.gds"); } // Tests copy_shapes with flattening minus one cell @@ -528,8 +528,8 @@ TEST(15) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -537,8 +537,8 @@ TEST(15) db::Layout l2; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l2.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l2.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l2); @@ -561,7 +561,7 @@ TEST(15) db::copy_shapes (l2, l1, db::ICplxTrans (), src, cm.table (), lm.table ()); CHECKPOINT(); - db::compare_layouts (_this, l2, tl::testsrc () + "/testdata/algo/layout_utils_au15.gds"); + db::compare_layouts (_this, l2, tl::testdata () + "/algo/layout_utils_au15.gds"); } // Tests copy_shapes/move_shapes with no specific mapping (flattening) @@ -569,8 +569,8 @@ TEST(16) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l1.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l1.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -578,8 +578,8 @@ TEST(16) db::Layout l2; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/layout_utils_l3.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/layout_utils_l3.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l2); @@ -604,14 +604,14 @@ TEST(16) db::copy_shapes (l2, l1, db::ICplxTrans (4.0), src, cm.table (), lm.table ()); CHECKPOINT(); - db::compare_layouts (_this, l2, tl::testsrc () + "/testdata/algo/layout_utils_au16.gds"); + db::compare_layouts (_this, l2, tl::testdata () + "/algo/layout_utils_au16.gds"); // ... and one test for move: db::move_shapes (l2copy, l1, db::ICplxTrans (4.0), src, cm.table (), lm.table ()); CHECKPOINT(); - db::compare_layouts (_this, l2copy, tl::testsrc () + "/testdata/algo/layout_utils_au16.gds"); - db::compare_layouts (_this, l1, tl::testsrc () + "/testdata/algo/layout_utils_au16b.gds"); + db::compare_layouts (_this, l2copy, tl::testdata () + "/algo/layout_utils_au16.gds"); + db::compare_layouts (_this, l1, tl::testdata () + "/algo/layout_utils_au16b.gds"); } @@ -619,8 +619,8 @@ TEST(17_scale_and_snap) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/scale_and_snap.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/scale_and_snap.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -629,20 +629,20 @@ TEST(17_scale_and_snap) db::scale_and_snap (l1, l1.cell (*l1.begin_top_down ()), 1, 20, 19); CHECKPOINT(); - db::compare_layouts (_this, l1, tl::testsrc () + "/testdata/algo/layout_utils_au_sns1.gds"); + db::compare_layouts (_this, l1, tl::testdata () + "/algo/layout_utils_au_sns1.gds"); db::scale_and_snap (l1, l1.cell (*l1.begin_top_down ()), 1, 19, 20); CHECKPOINT(); - db::compare_layouts (_this, l1, tl::testsrc () + "/testdata/algo/layout_utils_au_sns2.gds"); + db::compare_layouts (_this, l1, tl::testdata () + "/algo/layout_utils_au_sns2.gds"); } TEST(18_scale_and_snap) { db::Layout l1; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/scale_and_snap.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/scale_and_snap.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (l1); @@ -651,5 +651,5 @@ TEST(18_scale_and_snap) db::scale_and_snap (l1, l1.cell (*l1.begin_top_down ()), 19, 1, 1); CHECKPOINT(); - db::compare_layouts (_this, l1, tl::testsrc () + "/testdata/algo/layout_utils_au_sns3.gds"); + db::compare_layouts (_this, l1, tl::testdata () + "/algo/layout_utils_au_sns3.gds"); } diff --git a/src/db/unit_tests/dbLayoutVsSchematicTests.cc b/src/db/unit_tests/dbLayoutVsSchematicTests.cc index 10461475c..60f7647f4 100644 --- a/src/db/unit_tests/dbLayoutVsSchematicTests.cc +++ b/src/db/unit_tests/dbLayoutVsSchematicTests.cc @@ -76,8 +76,7 @@ TEST(1_BasicFlow) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "lvs_test_1.gds"); @@ -210,8 +209,7 @@ TEST(1_BasicFlow) { db::NetlistSpiceReader reader; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "lvs_test_1.spi"); @@ -232,7 +230,7 @@ TEST(1_BasicFlow) std::string path = tmp_file ("tmp_lvstest1.lvsdb"); lvs.save (path, false); - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "lvs_test1_au.lvsdb"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "lvs_test1_au.lvsdb"); compare_lvsdbs (_this, path, au_path); @@ -244,7 +242,7 @@ TEST(1_BasicFlow) lvs2.load (path); lvs2.save (path2, false); - std::string au_path2 = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "lvs_test1b_au.lvsdb"); + std::string au_path2 = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "lvs_test1b_au.lvsdb"); compare_lvsdbs (_this, path2, au_path2); } @@ -274,8 +272,7 @@ TEST(2_FlowWithErrors) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "lvs_test_1.gds"); @@ -408,8 +405,7 @@ TEST(2_FlowWithErrors) { db::NetlistSpiceReader reader; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "lvs_test_2.spi"); @@ -430,7 +426,7 @@ TEST(2_FlowWithErrors) std::string path = tmp_file ("tmp_lvstest2.lvsdb"); lvs.save (path, false); - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "lvs_test2_au.lvsdb"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "lvs_test2_au.lvsdb"); compare_lvsdbs (_this, path, au_path); @@ -442,7 +438,7 @@ TEST(2_FlowWithErrors) lvs2.load (path); lvs2.save (path2, false); - std::string au_path2 = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "lvs_test2b_au.lvsdb"); + std::string au_path2 = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "lvs_test2b_au.lvsdb"); compare_lvsdbs (_this, path2, au_path2); } diff --git a/src/db/unit_tests/dbLibrariesTests.cc b/src/db/unit_tests/dbLibrariesTests.cc index 8b95d8837..c59c25e03 100644 --- a/src/db/unit_tests/dbLibrariesTests.cc +++ b/src/db/unit_tests/dbLibrariesTests.cc @@ -230,8 +230,8 @@ static bool compare_vs_au (const tl::TestBase *tb, const db::Layout &layout, con { db::Layout layout_au; - std::string fn (tl::testsrc ()); - fn += "/testdata/gds/"; + std::string fn (tl::testdata ()); + fn += "/gds/"; fn += filename; tl::InputStream stream (fn); db::Reader reader (stream); diff --git a/src/db/unit_tests/dbNetlistDeviceExtractorTests.cc b/src/db/unit_tests/dbNetlistDeviceExtractorTests.cc index 45b8bc61c..e77984177 100644 --- a/src/db/unit_tests/dbNetlistDeviceExtractorTests.cc +++ b/src/db/unit_tests/dbNetlistDeviceExtractorTests.cc @@ -97,8 +97,7 @@ TEST(10_MOS3DeviceExtractorTest) { db::LoadLayoutOptions options; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "mos3_1.gds"); @@ -153,8 +152,7 @@ TEST(11_MOS3DeviceExtractorTestNotRectangularGate) { db::LoadLayoutOptions options; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "mos3_2.gds"); @@ -209,8 +207,7 @@ TEST(12_MOS3DeviceExtractorTestCircular) { db::LoadLayoutOptions options; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "mos3_3.gds"); @@ -265,8 +262,7 @@ TEST(20_MOS4DeviceExtractorTest) { db::LoadLayoutOptions options; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "mos4_1.gds"); @@ -326,8 +322,7 @@ TEST(21_MOS4DeviceExtractorTestNotRectangularGate) { db::LoadLayoutOptions options; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "mos4_2.gds"); @@ -387,8 +382,7 @@ TEST(22_MOS4DeviceExtractorTestCircular) { db::LoadLayoutOptions options; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "mos4_3.gds"); @@ -448,8 +442,7 @@ TEST(30_DMOS3DeviceExtractorTest) { db::LoadLayoutOptions options; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "dmos3_1.gds"); @@ -506,8 +499,7 @@ TEST(31_DMOS3DeviceExtractorTestNotRectangularGate) { db::LoadLayoutOptions options; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "dmos3_2.gds"); @@ -564,8 +556,7 @@ TEST(32_DMOS3DeviceExtractorTestCircular) { db::LoadLayoutOptions options; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "dmos3_3.gds"); @@ -622,8 +613,7 @@ TEST(40_DMOS4DeviceExtractorTest) { db::LoadLayoutOptions options; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "dmos4_1.gds"); @@ -685,8 +675,7 @@ TEST(41_DMOS4DeviceExtractorTestNotRectangularGate) { db::LoadLayoutOptions options; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "dmos4_2.gds"); @@ -748,8 +737,7 @@ TEST(42_DMOS4DeviceExtractorTestCircular) { db::LoadLayoutOptions options; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "dmos4_3.gds"); diff --git a/src/db/unit_tests/dbNetlistExtractorTests.cc b/src/db/unit_tests/dbNetlistExtractorTests.cc index 6f0bbf378..6324c42ea 100644 --- a/src/db/unit_tests/dbNetlistExtractorTests.cc +++ b/src/db/unit_tests/dbNetlistExtractorTests.cc @@ -185,8 +185,7 @@ TEST(1_DeviceAndNetExtraction) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l1.gds"); @@ -393,8 +392,7 @@ TEST(1_DeviceAndNetExtraction) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1.gds"); @@ -423,8 +421,7 @@ TEST(1a_DeviceAndNetExtractionWithTextsAsLabels) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l1.gds"); @@ -592,8 +589,7 @@ TEST(1a_DeviceAndNetExtractionWithTextsAsLabels) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1a.gds"); @@ -622,8 +618,7 @@ TEST(2_DeviceAndNetExtractionFlat) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l1.gds"); @@ -800,8 +795,7 @@ TEST(2_DeviceAndNetExtractionFlat) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1_flat.gds"); @@ -857,8 +851,7 @@ TEST(3_DeviceAndNetExtractionWithImplicitConnections) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l1_implicit_nets.gds"); @@ -1079,8 +1072,7 @@ TEST(3_DeviceAndNetExtractionWithImplicitConnections) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1_implicit_nets.gds"); @@ -1111,8 +1103,7 @@ TEST(4_ResAndCapExtraction) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "devices_test.oas"); @@ -1319,8 +1310,7 @@ TEST(4_ResAndCapExtraction) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_capres_nets.gds"); @@ -1351,8 +1341,7 @@ TEST(5_ResAndCapWithBulkExtraction) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "devices_with_bulk_test.oas"); @@ -1596,8 +1585,7 @@ TEST(5_ResAndCapWithBulkExtraction) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_capres_with_bulk_nets.gds"); @@ -1628,8 +1616,7 @@ TEST(6_BJT3TransistorExtraction) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "bipolar_devices_test.oas"); @@ -1842,8 +1829,7 @@ TEST(6_BJT3TransistorExtraction) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "bipolar_devices_nets.gds"); @@ -1868,8 +1854,7 @@ TEST(7_DiodeExtraction) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "diode_devices_test.oas"); @@ -1978,8 +1963,7 @@ TEST(7_DiodeExtraction) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "diode_devices_nets.gds"); @@ -2004,8 +1988,7 @@ TEST(8_DiodeExtractionScaled) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "diode_devices_test.oas"); @@ -2113,8 +2096,7 @@ TEST(8_DiodeExtractionScaled) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "diode_devices_nets.gds"); @@ -2144,8 +2126,7 @@ TEST(9_StrictDeviceExtraction) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l9.gds"); @@ -2356,8 +2337,7 @@ TEST(9_StrictDeviceExtraction) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au9.gds"); @@ -2386,8 +2366,7 @@ TEST(10_DeviceExtractionWithBreakoutCells) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l10.gds"); @@ -2551,8 +2530,7 @@ TEST(10_DeviceExtractionWithBreakoutCells) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au10.gds"); @@ -2575,8 +2553,7 @@ TEST(11_DeviceExtractionWithSameClass) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l11.gds"); @@ -2688,8 +2665,7 @@ TEST(12_FloatingSubcircuitExtraction) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l1_floating_subcircuits.gds"); @@ -2842,8 +2818,7 @@ TEST(13_RemoveDummyPins) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "issue-425.gds"); @@ -2973,8 +2948,7 @@ TEST(14_JoinNets) options.get_options ().layer_map = lmap; options.get_options ().create_other_layers = false; - std::string fn (tl::testsrc ()); - fn = tl::combine_path (fn, "testdata"); + std::string fn (tl::testdata ()); fn = tl::combine_path (fn, "algo"); fn = tl::combine_path (fn, "device_extract_l1_join_nets.gds"); @@ -3195,8 +3169,7 @@ TEST(14_JoinNets) // compare the collected test data - std::string au = tl::testsrc (); - au = tl::combine_path (au, "testdata"); + std::string au = tl::testdata (); au = tl::combine_path (au, "algo"); au = tl::combine_path (au, "device_extract_au1_join_nets.gds"); diff --git a/src/db/unit_tests/dbNetlistReaderTests.cc b/src/db/unit_tests/dbNetlistReaderTests.cc index d43004329..94dbf6b42 100644 --- a/src/db/unit_tests/dbNetlistReaderTests.cc +++ b/src/db/unit_tests/dbNetlistReaderTests.cc @@ -32,7 +32,7 @@ TEST(1_BasicReader) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader1.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader1.cir"); db::NetlistSpiceReader reader; tl::InputStream is (path); @@ -52,7 +52,7 @@ TEST(1b_BasicReader_ResistorModels) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader1b.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader1b.cir"); db::NetlistSpiceReader reader; tl::InputStream is (path); @@ -72,7 +72,7 @@ TEST(2_ReaderWithSubcircuits) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader2.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader2.cir"); db::NetlistSpiceReader reader; tl::InputStream is (path); @@ -110,7 +110,7 @@ TEST(3_ReaderWithSubcircuitsAltOrder) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader3.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader3.cir"); db::NetlistSpiceReader reader; tl::InputStream is (path); @@ -148,7 +148,7 @@ TEST(4_ReaderWithUnconnectedPins) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader4.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader4.cir"); db::NetlistSpiceReader reader; tl::InputStream is (path); @@ -177,7 +177,7 @@ TEST(5_CircuitParameters) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader5.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader5.cir"); db::NetlistSpiceReader reader; tl::InputStream is (path); @@ -254,7 +254,7 @@ TEST(6_ReaderWithDelegate) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader6.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader6.cir"); MyNetlistReaderDelegate delegate; db::NetlistSpiceReader reader (&delegate); @@ -280,7 +280,7 @@ TEST(7_GlobalNets) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader7.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader7.cir"); MyNetlistReaderDelegate delegate; db::NetlistSpiceReader reader (&delegate); @@ -319,7 +319,7 @@ TEST(8_Include) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader8.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader8.cir"); db::NetlistSpiceReader reader; tl::InputStream is (path); @@ -357,7 +357,7 @@ TEST(9_DeviceMultipliers) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader9.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader9.cir"); { db::NetlistSpiceReader reader; @@ -434,7 +434,7 @@ TEST(10_SubcircuitsNoPins) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader10.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader10.cir"); db::NetlistSpiceReader reader; tl::InputStream is (path); @@ -455,7 +455,7 @@ TEST(11_ErrorOnCircuitRedefinition) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader11.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader11.cir"); std::string msg; try { @@ -473,7 +473,7 @@ TEST(12_IgnoreDuplicateGlobals) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader12.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader12.cir"); db::NetlistSpiceReader reader; tl::InputStream is (path); @@ -494,7 +494,7 @@ TEST(13_NoGlobalNetsIfNotUsed) { db::Netlist nl; - std::string path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nreader13.cir"); + std::string path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nreader13.cir"); db::NetlistSpiceReader reader; tl::InputStream is (path); diff --git a/src/db/unit_tests/dbNetlistWriterTests.cc b/src/db/unit_tests/dbNetlistWriterTests.cc index a61972d53..e8519ddc0 100644 --- a/src/db/unit_tests/dbNetlistWriterTests.cc +++ b/src/db/unit_tests/dbNetlistWriterTests.cc @@ -104,7 +104,7 @@ TEST(1_WriterResistorDevices) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter1_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter1_au.txt"); compare_netlists (_this, path, au_path); } @@ -162,7 +162,7 @@ TEST(1_WriterResistorDevicesWithBulk) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter1_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter1_au.txt"); compare_netlists (_this, path, au_path); } @@ -219,7 +219,7 @@ TEST(2_WriterCapacitorDevices) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter2_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter2_au.txt"); compare_netlists (_this, path, au_path); } @@ -278,7 +278,7 @@ TEST(2_WriterCapacitorDevicesWithBulk) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter2_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter2_au.txt"); compare_netlists (_this, path, au_path); } @@ -350,7 +350,7 @@ TEST(3_WriterInductorDevices) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter3_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter3_au.txt"); compare_netlists (_this, path, au_path); } @@ -422,7 +422,7 @@ TEST(4_WriterDiodeDevices) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter4_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter4_au.txt"); compare_netlists (_this, path, au_path); } @@ -511,7 +511,7 @@ TEST(5_WriterMOS3Devices) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter5_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter5_au.txt"); compare_netlists (_this, path, au_path); } @@ -607,7 +607,7 @@ TEST(6_WriterMOS4Devices) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter6_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter6_au.txt"); compare_netlists (_this, path, au_path); } @@ -669,7 +669,7 @@ TEST(7_WriterAnyDevices) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter7_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter7_au.txt"); compare_netlists (_this, path, au_path); } @@ -812,7 +812,7 @@ TEST(8_WriterSubcircuits) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter8_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter8_au.txt"); compare_netlists (_this, path, au_path); } @@ -902,7 +902,7 @@ TEST(9_WriterNetNamesInsteadOfNumbers) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter9_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter9_au.txt"); compare_netlists (_this, path, au_path); } @@ -951,7 +951,7 @@ TEST(10_WriterLongLines) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter10_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter10_au.txt"); compare_netlists (_this, path, au_path); } @@ -1096,7 +1096,7 @@ TEST(11_WriterNonConnectedPins) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter11_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter11_au.txt"); compare_netlists (_this, path, au_path); @@ -1108,7 +1108,7 @@ TEST(11_WriterNonConnectedPins) writer.write (stream, nl, "written by unit test"); } - au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter11b_au.txt"); + au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter11b_au.txt"); compare_netlists (_this, path, au_path); } @@ -1116,7 +1116,7 @@ TEST(11_WriterNonConnectedPins) TEST(12_UniqueNetNames) { db::LayoutToNetlist l2n; - std::string l2n_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "same_net_names.l2n"); + std::string l2n_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "same_net_names.l2n"); l2n.load (l2n_path); // verify against the input @@ -1128,7 +1128,7 @@ TEST(12_UniqueNetNames) writer.write (stream, *l2n.netlist (), "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter12_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter12_au.txt"); compare_netlists (_this, path, au_path); @@ -1140,7 +1140,7 @@ TEST(12_UniqueNetNames) writer.write (stream, *l2n.netlist (), "written by unit test"); } - au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter12b_au.txt"); + au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter12b_au.txt"); compare_netlists (_this, path, au_path); } @@ -1229,7 +1229,7 @@ TEST(13_WriterBJT3Devices) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter13_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter13_au.txt"); compare_netlists (_this, path, au_path); } @@ -1325,7 +1325,7 @@ TEST(14_WriterBJT4Devices) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter14_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter14_au.txt"); compare_netlists (_this, path, au_path); } @@ -1429,7 +1429,7 @@ TEST(20_Delegate) writer.write (stream, nl, "written by unit test"); } - std::string au_path = tl::combine_path (tl::combine_path (tl::combine_path (tl::testsrc (), "testdata"), "algo"), "nwriter20_au.txt"); + std::string au_path = tl::combine_path (tl::combine_path (tl::testdata (), "algo"), "nwriter20_au.txt"); compare_netlists (_this, path, au_path); } diff --git a/src/db/unit_tests/dbPCellsTests.cc b/src/db/unit_tests/dbPCellsTests.cc index 0255d240e..0ef50be82 100644 --- a/src/db/unit_tests/dbPCellsTests.cc +++ b/src/db/unit_tests/dbPCellsTests.cc @@ -101,15 +101,15 @@ TEST(0) // Note: this sample requires the BASIC lib { - std::string fn (tl::testsrc ()); - fn += "/testdata/gds/pcell_test_0.gds"; + std::string fn (tl::testdata ()); + fn += "/gds/pcell_test_0.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (layout); } CHECKPOINT (); - db::compare_layouts (_this, layout, tl::testsrc () + "/testdata/gds/pcell_test_0_au.gds", db::NoNormalization); + db::compare_layouts (_this, layout, tl::testdata () + "/gds/pcell_test_0_au.gds", db::NoNormalization); } TEST(1) @@ -173,7 +173,7 @@ TEST(1) EXPECT_EQ (layout.get_properties(2).to_string (), "24/0"); CHECKPOINT (); - db::compare_layouts (_this, layout, tl::testsrc () + "/testdata/gds/pcell_test.gds", db::NoNormalization); + db::compare_layouts (_this, layout, tl::testdata () + "/gds/pcell_test.gds", db::NoNormalization); // if not in editable mode, we could have lost the reference to the second instance if (db::default_editable_mode ()) { @@ -185,7 +185,7 @@ TEST(1) EXPECT_NE (i2.cell_index (), pd1); CHECKPOINT (); - db::compare_layouts (_this, layout, tl::testsrc () + "/testdata/gds/pcell_test2.gds", db::NoNormalization); + db::compare_layouts (_this, layout, tl::testdata () + "/gds/pcell_test2.gds", db::NoNormalization); width = 1.0; i1 = top.change_pcell_parameters (i1, parameters); @@ -193,34 +193,34 @@ TEST(1) EXPECT_NE (i1.cell_index (), pd1); CHECKPOINT (); - db::compare_layouts (_this, layout, tl::testsrc () + "/testdata/gds/pcell_test3.gds", db::WriteGDS2); + db::compare_layouts (_this, layout, tl::testdata () + "/gds/pcell_test3.gds", db::WriteGDS2); CHECKPOINT (); - db::compare_layouts (_this, layout, tl::testsrc () + "/testdata/gds/pcell_test3.gds", db::WriteOAS); + db::compare_layouts (_this, layout, tl::testdata () + "/gds/pcell_test3.gds", db::WriteOAS); m.commit (); m.undo (); CHECKPOINT (); - db::compare_layouts (_this, layout, tl::testsrc () + "/testdata/gds/pcell_test.gds", db::NoNormalization); + db::compare_layouts (_this, layout, tl::testdata () + "/gds/pcell_test.gds", db::NoNormalization); m.redo (); CHECKPOINT (); - db::compare_layouts (_this, layout, tl::testsrc () + "/testdata/gds/pcell_test3.gds", db::WriteGDS2); + db::compare_layouts (_this, layout, tl::testdata () + "/gds/pcell_test3.gds", db::WriteGDS2); CHECKPOINT (); - db::compare_layouts (_this, layout, tl::testsrc () + "/testdata/gds/pcell_test3.gds", db::WriteOAS); + db::compare_layouts (_this, layout, tl::testdata () + "/gds/pcell_test3.gds", db::WriteOAS); m.undo (); // test the ability to destroy things stored in the transaction CHECKPOINT (); - db::compare_layouts (_this, layout, tl::testsrc () + "/testdata/gds/pcell_test.gds", db::NoNormalization); + db::compare_layouts (_this, layout, tl::testdata () + "/gds/pcell_test.gds", db::NoNormalization); // Test the ability to copy things and change PCell parameters then db::Layout copy (layout); CHECKPOINT (); - db::compare_layouts (_this, copy, tl::testsrc () + "/testdata/gds/pcell_test.gds", db::NoNormalization); + db::compare_layouts (_this, copy, tl::testdata () + "/gds/pcell_test.gds", db::NoNormalization); db::Cell ©_top = copy.cell (top.cell_index ()); @@ -245,9 +245,9 @@ TEST(1) i1_copy = copy_top.change_pcell_parameters (i1_copy, parameters); CHECKPOINT (); - db::compare_layouts (_this, copy, tl::testsrc () + "/testdata/gds/pcell_test4.gds", db::WriteGDS2); + db::compare_layouts (_this, copy, tl::testdata () + "/gds/pcell_test4.gds", db::WriteGDS2); CHECKPOINT (); - db::compare_layouts (_this, copy, tl::testsrc () + "/testdata/gds/pcell_test4.gds", db::WriteOAS); + db::compare_layouts (_this, copy, tl::testdata () + "/gds/pcell_test4.gds", db::WriteOAS); } } diff --git a/src/db/unit_tests/dbRegionTests.cc b/src/db/unit_tests/dbRegionTests.cc index b1a6c41a0..e11ff12de 100644 --- a/src/db/unit_tests/dbRegionTests.cc +++ b/src/db/unit_tests/dbRegionTests.cc @@ -1598,8 +1598,8 @@ TEST(32a_snap) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/scale_and_snap.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/scale_and_snap.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1616,15 +1616,15 @@ TEST(32a_snap) r2.insert_into (&ly, top_cell_index, ly.get_layer (db::LayerProperties (100, 0))); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/region_au32.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/region_au32.gds"); } TEST(32b_snap) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/scale_and_snap.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/scale_and_snap.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1641,15 +1641,15 @@ TEST(32b_snap) r1.insert_into (&ly, top_cell_index, ly.get_layer (db::LayerProperties (100, 0))); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/region_au32.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/region_au32.gds"); } TEST(33a_snap) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/scale_and_snap.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/scale_and_snap.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1666,15 +1666,15 @@ TEST(33a_snap) r2.insert_into (&ly, top_cell_index, ly.get_layer (db::LayerProperties (100, 0))); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/region_au33.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/region_au33.gds"); } TEST(33b_snap) { db::Layout ly; { - std::string fn (tl::testsrc ()); - fn += "/testdata/algo/scale_and_snap.gds"; + std::string fn (tl::testdata ()); + fn += "/algo/scale_and_snap.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (ly); @@ -1691,7 +1691,7 @@ TEST(33b_snap) r1.insert_into (&ly, top_cell_index, ly.get_layer (db::LayerProperties (100, 0))); CHECKPOINT(); - db::compare_layouts (_this, ly, tl::testsrc () + "/testdata/algo/region_au33.gds"); + db::compare_layouts (_this, ly, tl::testdata () + "/algo/region_au33.gds"); } TEST(34a) diff --git a/src/drc/unit_tests/drcBasicTests.cc b/src/drc/unit_tests/drcBasicTests.cc index 7380bf6ad..3d3b7e736 100644 --- a/src/drc/unit_tests/drcBasicTests.cc +++ b/src/drc/unit_tests/drcBasicTests.cc @@ -27,10 +27,10 @@ TEST(1) { - std::string input = tl::testsrc (); - input += "/testdata/drc/drctest.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcBasicTests_au.gds"; + std::string input = tl::testdata (); + input += "/drc/drctest.gds"; + std::string au = tl::testdata (); + au += "/drc/drcBasicTests_au.gds"; std::string output = this->tmp_file ("tmp.gds"); diff --git a/src/drc/unit_tests/drcGenericTests.cc b/src/drc/unit_tests/drcGenericTests.cc index ea4de5476..d5763d140 100644 --- a/src/drc/unit_tests/drcGenericTests.cc +++ b/src/drc/unit_tests/drcGenericTests.cc @@ -30,14 +30,14 @@ static void run_test (tl::TestBase *_this, const std::string &number, bool deep) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcGenericTests_" + number + ".drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcGenericTests_" + number + ".drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drcGenericTests_" + number + ".gds"; + std::string input = tl::testdata (); + input += "/drc/drcGenericTests_" + number + ".gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcGenericTests_au" + number + std::string (deep ? "d" : "") + ".gds"; + std::string au = tl::testdata (); + au += "/drc/drcGenericTests_au" + number + std::string (deep ? "d" : "") + ".gds"; std::string output = _this->tmp_file ("tmp.gds"); diff --git a/src/drc/unit_tests/drcSimpleTests.cc b/src/drc/unit_tests/drcSimpleTests.cc index 5d3abc750..15b6d54d4 100644 --- a/src/drc/unit_tests/drcSimpleTests.cc +++ b/src/drc/unit_tests/drcSimpleTests.cc @@ -30,11 +30,11 @@ TEST(1) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_1.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_1.drc"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au1.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au1.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -67,14 +67,14 @@ TEST(1) TEST(2) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_2.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_2.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drctest.gds"; + std::string input = tl::testdata (); + input += "/drc/drctest.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au2.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au2.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -107,14 +107,14 @@ TEST(2) TEST(3_Flat) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_3.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_3.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drctest.gds"; + std::string input = tl::testdata (); + input += "/drc/drctest.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au3.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au3.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -147,14 +147,14 @@ TEST(3_Flat) TEST(4_Hierarchical) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_4.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_4.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drctest.gds"; + std::string input = tl::testdata (); + input += "/drc/drctest.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au4.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au4.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -187,14 +187,14 @@ TEST(4_Hierarchical) TEST(5_FlatAntenna) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_5.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_5.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/antenna_l1.gds"; + std::string input = tl::testdata (); + input += "/drc/antenna_l1.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au5.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au5.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -227,14 +227,14 @@ TEST(5_FlatAntenna) TEST(6_HierarchicalAntenna) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_6.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_6.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/antenna_l1.gds"; + std::string input = tl::testdata (); + input += "/drc/antenna_l1.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au6.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au6.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -267,14 +267,14 @@ TEST(6_HierarchicalAntenna) TEST(7_AntennaWithDiodes) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_7.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_7.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/antenna_l1.gds"; + std::string input = tl::testdata (); + input += "/drc/antenna_l1.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au7.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au7.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -307,14 +307,14 @@ TEST(7_AntennaWithDiodes) TEST(8_TextsAndPolygons) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_8.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_8.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/texts.gds"; + std::string input = tl::testdata (); + input += "/drc/texts.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au8.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au8.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -368,17 +368,17 @@ static void compare_netlists (tl::TestBase *_this, const std::string &cir, const TEST(9_NetlistExtraction) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_9.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_9.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/ringo.gds"; + std::string input = tl::testdata (); + input += "/drc/ringo.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au9a.cir"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au9a.cir"; - std::string au_simplified = tl::testsrc (); - au_simplified += "/testdata/drc/drcSimpleTests_au9b.cir"; + std::string au_simplified = tl::testdata (); + au_simplified += "/drc/drcSimpleTests_au9b.cir"; std::string output = this->tmp_file ("tmp.cir"); std::string output_simplified = this->tmp_file ("tmp_simplified.cir"); @@ -412,17 +412,17 @@ TEST(9_NetlistExtraction) TEST(10_NetlistExtractionFlat) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_10.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_10.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/ringo.gds"; + std::string input = tl::testdata (); + input += "/drc/ringo.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au10a.cir"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au10a.cir"; - std::string au_simplified = tl::testsrc (); - au_simplified += "/testdata/drc/drcSimpleTests_au10b.cir"; + std::string au_simplified = tl::testdata (); + au_simplified += "/drc/drcSimpleTests_au10b.cir"; std::string output = this->tmp_file ("tmp.cir"); std::string output_simplified = this->tmp_file ("tmp_simplified.cir"); @@ -456,17 +456,17 @@ TEST(10_NetlistExtractionFlat) TEST(11_CustomDevices) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_11.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_11.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/vdiv.gds"; + std::string input = tl::testdata (); + input += "/drc/vdiv.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au11a.cir"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au11a.cir"; - std::string au_simplified = tl::testsrc (); - au_simplified += "/testdata/drc/drcSimpleTests_au11b.cir"; + std::string au_simplified = tl::testdata (); + au_simplified += "/drc/drcSimpleTests_au11b.cir"; std::string output = this->tmp_file ("tmp.cir"); std::string output_simplified = this->tmp_file ("tmp_simplified.cir"); @@ -500,14 +500,14 @@ TEST(11_CustomDevices) TEST(12_NetlistJoinLabels) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_12.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_12.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/implicit_nets.gds"; + std::string input = tl::testdata (); + input += "/drc/implicit_nets.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au12a.cir"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au12a.cir"; std::string output = this->tmp_file ("tmp.cir"); @@ -536,14 +536,14 @@ TEST(12_NetlistJoinLabels) TEST(13a_KissingCorners) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_13a.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_13a.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/kissing_corners.gds"; + std::string input = tl::testdata (); + input += "/drc/kissing_corners.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au13a.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au13a.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -579,14 +579,14 @@ TEST(13a_KissingCorners) TEST(13b_KissingCornersDeep) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_13b.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_13b.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/kissing_corners.gds"; + std::string input = tl::testdata (); + input += "/drc/kissing_corners.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au13b.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au13b.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -622,17 +622,17 @@ TEST(13b_KissingCornersDeep) TEST(14_SwitchingTargets) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_14.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_14.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drcSimpleTests_14.gds"; + std::string input = tl::testdata (); + input += "/drc/drcSimpleTests_14.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au14.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au14.gds"; - std::string au2 = tl::testsrc (); - au2 += "/testdata/drc/drcSimpleTests_au14_2.gds"; + std::string au2 = tl::testdata (); + au2 += "/drc/drcSimpleTests_au14_2.gds"; std::string output = this->tmp_file ("tmp.gds"); std::string output2 = this->tmp_file ("tmp2.gds"); @@ -677,14 +677,14 @@ TEST(14_SwitchingTargets) TEST(15_issue548) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_15.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_15.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drcSimpleTests_15.gds"; + std::string input = tl::testdata (); + input += "/drc/drcSimpleTests_15.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au15.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au15.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -718,14 +718,14 @@ TEST(15_issue548) // Edges::extents isn't deep-enabled TEST(16_issue570) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_16.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_16.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drcSimpleTests_16.gds"; + std::string input = tl::testdata (); + input += "/drc/drcSimpleTests_16.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au16.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au16.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -759,14 +759,14 @@ TEST(16_issue570) // Problems with Source#select TEST(17_issue570) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_17.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_17.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drcSimpleTests_17.gds"; + std::string input = tl::testdata (); + input += "/drc/drcSimpleTests_17.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au17.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au17.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -799,14 +799,14 @@ TEST(17_issue570) TEST(18_forget) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_18.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_18.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drcSimpleTests_18.gds"; + std::string input = tl::testdata (); + input += "/drc/drcSimpleTests_18.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au18.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au18.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -839,14 +839,14 @@ TEST(18_forget) TEST(19_shielding) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_19.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_19.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drcSimpleTests_19.gds"; + std::string input = tl::testdata (); + input += "/drc/drcSimpleTests_19.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au19.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au19.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -879,14 +879,14 @@ TEST(19_shielding) TEST(20_interact_with_count) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_20.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_20.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drcSimpleTests_20.gds"; + std::string input = tl::testdata (); + input += "/drc/drcSimpleTests_20.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au20.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au20.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -919,14 +919,14 @@ TEST(20_interact_with_count) TEST(21_breaking) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_21.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_21.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drcSimpleTests_21.gds"; + std::string input = tl::testdata (); + input += "/drc/drcSimpleTests_21.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au21.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au21.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -959,14 +959,14 @@ TEST(21_breaking) TEST(22_opposite_filter) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_22.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_22.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drcSimpleTests_22.gds"; + std::string input = tl::testdata (); + input += "/drc/drcSimpleTests_22.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au22.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au22.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -999,14 +999,14 @@ TEST(22_opposite_filter) TEST(23_rect_filter) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_23.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_23.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drcSimpleTests_23.gds"; + std::string input = tl::testdata (); + input += "/drc/drcSimpleTests_23.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au23.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au23.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -1039,14 +1039,14 @@ TEST(23_rect_filter) TEST(24_enclosing) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_24.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_24.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drcSimpleTests_24.gds"; + std::string input = tl::testdata (); + input += "/drc/drcSimpleTests_24.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au24.gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au24.gds"; std::string output = this->tmp_file ("tmp.gds"); @@ -1079,14 +1079,14 @@ TEST(24_enclosing) static void run_test (tl::TestBase *_this, const std::string &number, bool deep) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSimpleTests_" + number + ".drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSimpleTests_" + number + ".drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drcSimpleTests_" + number + ".gds"; + std::string input = tl::testdata (); + input += "/drc/drcSimpleTests_" + number + ".gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSimpleTests_au" + number + std::string (deep ? "d" : "") + ".gds"; + std::string au = tl::testdata (); + au += "/drc/drcSimpleTests_au" + number + std::string (deep ? "d" : "") + ".gds"; std::string output = _this->tmp_file ("tmp.gds"); diff --git a/src/drc/unit_tests/drcSuiteTests.cc b/src/drc/unit_tests/drcSuiteTests.cc index 93b9a32ec..77c6f5a96 100644 --- a/src/drc/unit_tests/drcSuiteTests.cc +++ b/src/drc/unit_tests/drcSuiteTests.cc @@ -27,14 +27,14 @@ void runtest (tl::TestBase *_this, int mode) { - std::string rs = tl::testsrc (); - rs += "/testdata/drc/drcSuiteTests.drc"; + std::string rs = tl::testdata (); + rs += "/drc/drcSuiteTests.drc"; - std::string input = tl::testsrc (); - input += "/testdata/drc/drctest.gds"; + std::string input = tl::testdata (); + input += "/drc/drctest.gds"; - std::string au = tl::testsrc (); - au += "/testdata/drc/drcSuiteTests_au"; + std::string au = tl::testdata (); + au += "/drc/drcSuiteTests_au"; au += tl::to_string (mode); au += ".oas"; diff --git a/src/lay/unit_tests/laySessionTests.cc b/src/lay/unit_tests/laySessionTests.cc index 34a74cfe3..5ff99d846 100644 --- a/src/lay/unit_tests/laySessionTests.cc +++ b/src/lay/unit_tests/laySessionTests.cc @@ -41,7 +41,7 @@ TEST (1) mw->close_all (); - mw->load_layout (tl::testsrc () + "/testdata/sessions/test.gds"); + mw->load_layout (tl::testdata () + "/sessions/test.gds"); lay::LayoutView *view = mw->current_view (); @@ -59,18 +59,18 @@ TEST (1) tl_assert (img_service != 0); if (img_service) { img::Object img; - img.load_data (tl::testsrc () + "/testdata/sessions/test.png"); + img.load_data (tl::testdata () + "/sessions/test.png"); img_service->insert_image (img); } std::unique_ptr rdb (new rdb::Database ()); - rdb->load (tl::testsrc () + "/testdata/sessions/test.lyrdb"); + rdb->load (tl::testdata () + "/sessions/test.lyrdb"); view->add_rdb (rdb.release ()); - std::unique_ptr l2ndb (db::LayoutToNetlist::create_from_file (tl::testsrc () + "/testdata/sessions/test.l2n")); + std::unique_ptr l2ndb (db::LayoutToNetlist::create_from_file (tl::testdata () + "/sessions/test.l2n")); view->add_l2ndb (l2ndb.release ()); - std::unique_ptr lvsdb (db::LayoutToNetlist::create_from_file (tl::testsrc () + "/testdata/sessions/test.lvsdb")); + std::unique_ptr lvsdb (db::LayoutToNetlist::create_from_file (tl::testdata () + "/sessions/test.lvsdb")); view->add_l2ndb (lvsdb.release ()); std::string lys_file = tmp_file ("test1.lys"); @@ -133,7 +133,7 @@ TEST (2) mw->close_all (); EXPECT_EQ (mw->views (), (unsigned int) 0); - mw->restore_session (tl::testsrc () + "/testdata/sessions/test_with_relative_paths.lys"); + mw->restore_session (tl::testdata () + "/sessions/test_with_relative_paths.lys"); EXPECT_EQ (mw->views (), (unsigned int) 1); diff --git a/src/laybasic/unit_tests/layNetlistBrowserModelTests.cc b/src/laybasic/unit_tests/layNetlistBrowserModelTests.cc index d57531088..57599b8af 100644 --- a/src/laybasic/unit_tests/layNetlistBrowserModelTests.cc +++ b/src/laybasic/unit_tests/layNetlistBrowserModelTests.cc @@ -26,7 +26,7 @@ TEST (1) { db::LayoutToNetlist l2n; - l2n.load (tl::testsrc () + "/testdata/lay/l2n_browser.l2n"); + l2n.load (tl::testdata () + "/lay/l2n_browser.l2n"); lay::NetColorizer colorizer; std::unique_ptr model (new lay::NetlistBrowserModel (0, &l2n, &colorizer)); @@ -243,7 +243,7 @@ TEST (1) TEST (2) { db::LayoutVsSchematic lvs; - lvs.load (tl::testsrc () + "/testdata/lay/lvsdb_browser.lvsdb"); + lvs.load (tl::testdata () + "/lay/lvsdb_browser.lvsdb"); lay::NetColorizer colorizer; std::unique_ptr model (new lay::NetlistBrowserModel (0, &lvs, &colorizer)); @@ -409,7 +409,7 @@ TEST (2) TEST (3) { db::LayoutToNetlist l2n; - l2n.load (tl::testsrc () + "/testdata/lay/l2n_browser.l2n"); + l2n.load (tl::testdata () + "/lay/l2n_browser.l2n"); lay::NetColorizer colorizer; std::unique_ptr model (new lay::NetlistBrowserModel (0, &l2n, &colorizer)); @@ -436,7 +436,7 @@ TEST (3) TEST (4) { db::LayoutToNetlist l2n; - l2n.load (tl::testsrc () + "/testdata/lay/l2n_browser.l2n"); + l2n.load (tl::testdata () + "/lay/l2n_browser.l2n"); lay::NetColorizer colorizer; std::unique_ptr model (new lay::NetlistBrowserModel (0, &l2n, &colorizer)); @@ -466,7 +466,7 @@ TEST (4) TEST (5) { db::LayoutVsSchematic lvs; - lvs.load (tl::testsrc () + "/testdata/lay/lvsdb_browser.lvsdb"); + lvs.load (tl::testdata () + "/lay/lvsdb_browser.lvsdb"); lay::NetColorizer colorizer; std::unique_ptr model (new lay::NetlistBrowserModel (0, &lvs, &colorizer)); @@ -524,7 +524,7 @@ TEST (5) TEST (6) { db::LayoutVsSchematic lvs; - lvs.load (tl::testsrc () + "/testdata/lay/lvsdb_browser.lvsdb"); + lvs.load (tl::testdata () + "/lay/lvsdb_browser.lvsdb"); lay::NetColorizer colorizer; std::unique_ptr model (new lay::NetlistBrowserModel (0, &lvs, &colorizer)); diff --git a/src/laybasic/unit_tests/layNetlistBrowserTreeModelTests.cc b/src/laybasic/unit_tests/layNetlistBrowserTreeModelTests.cc index 5b25ef55d..ef477e06a 100644 --- a/src/laybasic/unit_tests/layNetlistBrowserTreeModelTests.cc +++ b/src/laybasic/unit_tests/layNetlistBrowserTreeModelTests.cc @@ -26,7 +26,7 @@ TEST (1) { db::LayoutToNetlist l2n; - l2n.load (tl::testsrc () + "/testdata/lay/l2n_browser.l2n"); + l2n.load (tl::testdata () + "/lay/l2n_browser.l2n"); std::unique_ptr model (new lay::NetlistBrowserTreeModel (0, &l2n)); @@ -58,7 +58,7 @@ TEST (1) TEST (2) { db::LayoutVsSchematic lvs; - lvs.load (tl::testsrc () + "/testdata/lay/lvsdb_browser.lvsdb"); + lvs.load (tl::testdata () + "/lay/lvsdb_browser.lvsdb"); std::unique_ptr model (new lay::NetlistBrowserTreeModel (0, &lvs)); diff --git a/src/lvs/unit_tests/lvsBasicTests.cc b/src/lvs/unit_tests/lvsBasicTests.cc index 17abd3355..e99562457 100644 --- a/src/lvs/unit_tests/lvsBasicTests.cc +++ b/src/lvs/unit_tests/lvsBasicTests.cc @@ -27,13 +27,13 @@ TEST(1) { - std::string input = tl::testsrc (); - input += "/testdata/lvs/inv.oas"; + std::string input = tl::testdata (); + input += "/lvs/inv.oas"; std::string schematic = "inv.cir"; // relative to inv.oas - std::string au_cir = tl::testsrc (); - au_cir += "/testdata/lvs/inv_layout.cir"; - std::string au_lvsdb = tl::testsrc (); - au_lvsdb += "/testdata/lvs/inv.lvsdb"; + std::string au_cir = tl::testdata (); + au_cir += "/lvs/inv_layout.cir"; + std::string au_lvsdb = tl::testdata (); + au_lvsdb += "/lvs/inv.lvsdb"; std::string output_cir = this->tmp_file ("tmp.cir"); std::string output_lvsdb = this->tmp_file ("tmp.lvsdb"); @@ -126,13 +126,13 @@ TEST(1) TEST(2) { - std::string input = tl::testsrc (); - input += "/testdata/lvs/inv2.oas"; + std::string input = tl::testdata (); + input += "/lvs/inv2.oas"; std::string schematic = "inv2.cir"; // relative to inv2.oas - std::string au_cir = tl::testsrc (); - au_cir += "/testdata/lvs/inv2_layout.cir"; - std::string au_lvsdb = tl::testsrc (); - au_lvsdb += "/testdata/lvs/inv2.lvsdb"; + std::string au_cir = tl::testdata (); + au_cir += "/lvs/inv2_layout.cir"; + std::string au_lvsdb = tl::testdata (); + au_lvsdb += "/lvs/inv2.lvsdb"; std::string output_cir = this->tmp_file ("tmp.cir"); std::string output_lvsdb = this->tmp_file ("tmp.lvsdb"); diff --git a/src/lvs/unit_tests/lvsSimpleTests.cc b/src/lvs/unit_tests/lvsSimpleTests.cc index 66cdcb4a7..48e64cede 100644 --- a/src/lvs/unit_tests/lvsSimpleTests.cc +++ b/src/lvs/unit_tests/lvsSimpleTests.cc @@ -30,20 +30,20 @@ void run_test (tl::TestBase *_this, const std::string &suffix, const std::string &layout, bool with_l2n = false, const std::string &top = std::string (), bool change_case = false) { - std::string rs = tl::testsrc (); - rs += "/testdata/lvs/" + suffix + ".lvs"; + std::string rs = tl::testdata (); + rs += "/lvs/" + suffix + ".lvs"; - std::string src = tl::testsrc (); - src += "/testdata/lvs/" + layout; + std::string src = tl::testdata (); + src += "/lvs/" + layout; - std::string au_lvsdb = tl::testsrc (); - au_lvsdb += "/testdata/lvs/" + suffix + ".lvsdb"; + std::string au_lvsdb = tl::testdata (); + au_lvsdb += "/lvs/" + suffix + ".lvsdb"; - std::string au_cir = tl::testsrc (); - au_cir += "/testdata/lvs/" + suffix + ".cir"; + std::string au_cir = tl::testdata (); + au_cir += "/lvs/" + suffix + ".cir"; - std::string au_l2n = tl::testsrc (); - au_l2n += "/testdata/lvs/" + suffix + ".l2n"; + std::string au_l2n = tl::testdata (); + au_l2n += "/lvs/" + suffix + ".l2n"; std::string output_lvsdb = _this->tmp_file ("tmp.lvsdb"); std::string output_cir = _this->tmp_file ("tmp.cir"); diff --git a/src/lvs/unit_tests/lvsTests.cc b/src/lvs/unit_tests/lvsTests.cc index 56fb41d96..2224bafa6 100644 --- a/src/lvs/unit_tests/lvsTests.cc +++ b/src/lvs/unit_tests/lvsTests.cc @@ -32,8 +32,8 @@ void run_test (tl::TestBase *_this, const std::string &lvs_rs, const std::string &au_netlist, const std::string &layout, bool priv = false, const std::string &au_lvsdb_name = std::string ()) { - std::string testsrc = priv ? tl::testsrc_private () : tl::testsrc (); - testsrc = tl::combine_path (tl::combine_path (testsrc, "testdata"), "lvs"); + std::string testsrc = priv ? tl::testdata_private () : tl::testdata (); + testsrc = tl::combine_path (testsrc, "lvs"); std::string rs = tl::combine_path (testsrc, lvs_rs); std::string ly = tl::combine_path (testsrc, layout); diff --git a/src/plugins/streamers/cif/unit_tests/dbCIFReader.cc b/src/plugins/streamers/cif/unit_tests/dbCIFReader.cc index 1e264397c..bc0488b50 100644 --- a/src/plugins/streamers/cif/unit_tests/dbCIFReader.cc +++ b/src/plugins/streamers/cif/unit_tests/dbCIFReader.cc @@ -54,7 +54,7 @@ static void run_test (tl::TestBase *_this, const std::string &base, const char * { std::string fn (base); - fn += "/testdata/cif/"; + fn += "/cif/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -115,7 +115,7 @@ static void run_test (tl::TestBase *_this, const std::string &base, const char * { std::string fn (base); - fn += "/testdata/cif/"; + fn += "/cif/"; fn += file_au; tl::InputStream stream (fn); db::Reader reader (stream); @@ -135,74 +135,74 @@ static void run_test (tl::TestBase *_this, const std::string &base, const char * TEST(1a) { - run_test (_this, tl::testsrc_private (), "t1.cif.gz", "t1a_au.gds.gz"); + run_test (_this, tl::testdata_private (), "t1.cif.gz", "t1a_au.gds.gz"); } TEST(1b) { - run_test (_this, tl::testsrc_private (), "t1.cif.gz", "t1b_au.gds.gz", 0, 0.01); + run_test (_this, tl::testdata_private (), "t1.cif.gz", "t1b_au.gds.gz", 0, 0.01); } TEST(1c) { - run_test (_this, tl::testsrc_private (), "t1.cif.gz", "t1b_au.gds.gz", 0, 0.01, true); + run_test (_this, tl::testdata_private (), "t1.cif.gz", "t1b_au.gds.gz", 0, 0.01, true); } TEST(1d) { - run_test (_this, tl::testsrc_private (), "t1.cif.gz", "t1b_au.gds.gz", 0, 0.01, false, true); + run_test (_this, tl::testdata_private (), "t1.cif.gz", "t1b_au.gds.gz", 0, 0.01, false, true); } TEST(2) { - run_test (_this, tl::testsrc_private (), "t2.cif.gz", "t2_au.gds.gz"); + run_test (_this, tl::testdata_private (), "t2.cif.gz", "t2_au.gds.gz"); } TEST(3a) { - run_test (_this, tl::testsrc_private (), "t3.cif.gz", "t3a_au.gds.gz", "CAA:43,CCA:48,CCP:47,CMF:49,CMS:51,CPG:46,CSN:45,CSP:44,CVA:50,CWN:42,XP:26"); + run_test (_this, tl::testdata_private (), "t3.cif.gz", "t3a_au.gds.gz", "CAA:43,CCA:48,CCP:47,CMF:49,CMS:51,CPG:46,CSN:45,CSP:44,CVA:50,CWN:42,XP:26"); } TEST(3b) { - run_test (_this, tl::testsrc_private (), "t3.cif.gz", "t3b_au.gds.gz", "CAA:43,CCA:48,CCP:47,CMF:49,CMS:51,CPG:46,CSN:45,CSP:44,CVA:50,CWN:42,XP:26", 0.00012); + run_test (_this, tl::testdata_private (), "t3.cif.gz", "t3b_au.gds.gz", "CAA:43,CCA:48,CCP:47,CMF:49,CMS:51,CPG:46,CSN:45,CSP:44,CVA:50,CWN:42,XP:26", 0.00012); } TEST(3c) { - run_test (_this, tl::testsrc_private (), "t3.cif.gz", "t3c_au.gds.gz", "(CPG:1/0) +(CPG:1000/0) (CCP:1/0) (CMF:2/0) +(CMF:1000/0) (CVA:3/0)", 0.00012); + run_test (_this, tl::testdata_private (), "t3.cif.gz", "t3c_au.gds.gz", "(CPG:1/0) +(CPG:1000/0) (CCP:1/0) (CMF:2/0) +(CMF:1000/0) (CVA:3/0)", 0.00012); } TEST(4) { - run_test (_this, tl::testsrc_private (), "t4.cif.gz", "t4_au.gds.gz"); + run_test (_this, tl::testdata_private (), "t4.cif.gz", "t4_au.gds.gz"); } TEST(5) { - run_test (_this, tl::testsrc_private (), "t5.cif.gz", "t5_au.gds.gz"); + run_test (_this, tl::testdata_private (), "t5.cif.gz", "t5_au.gds.gz"); } // Issue #28 TEST(lasi) { - run_test (_this, tl::testsrc (), "lasi.cif.gz", "lasi_au.gds.gz"); + run_test (_this, tl::testdata (), "lasi.cif.gz", "lasi_au.gds.gz"); } // Issue #305 TEST(rot_boxes) { - run_test (_this, tl::testsrc (), "issue_305.cif", "issue_305_au.gds"); + run_test (_this, tl::testdata (), "issue_305.cif", "issue_305_au.gds"); } // Issue #568 TEST(rot_instances) { - run_test (_this, tl::testsrc (), "issue_568.cif", "issue_568_au.gds"); + run_test (_this, tl::testdata (), "issue_568.cif", "issue_568_au.gds"); } // Issue #578 TEST(rot_instances2) { - run_test (_this, tl::testsrc (), "issue_578.cif", "issue_578_au.gds"); + run_test (_this, tl::testdata (), "issue_578.cif", "issue_578_au.gds"); } diff --git a/src/plugins/streamers/dxf/unit_tests/dbDXFReaderTests.cc b/src/plugins/streamers/dxf/unit_tests/dbDXFReaderTests.cc index 6c81e9461..f281e9673 100644 --- a/src/plugins/streamers/dxf/unit_tests/dbDXFReaderTests.cc +++ b/src/plugins/streamers/dxf/unit_tests/dbDXFReaderTests.cc @@ -62,16 +62,16 @@ static void do_run_test (tl::TestBase *_this, const std::string &fn, const std:: static void run_test (tl::TestBase *_this, const char *file, const char *file_au, const db::DXFReaderOptions &opt = db::DXFReaderOptions (), bool as_oas = false) { - std::string fn = tl::testsrc_private () + "/testdata/dxf/" + file; - std::string fn_au = tl::testsrc_private () + std::string ("/testdata/dxf/") + file_au; + std::string fn = tl::testdata_private () + "/dxf/" + file; + std::string fn_au = tl::testdata_private () + std::string ("/dxf/") + file_au; do_run_test (_this, fn, fn_au, opt, as_oas); } static void run_test_public (tl::TestBase *_this, const char *file, const char *file_au, const db::DXFReaderOptions &opt = db::DXFReaderOptions (), bool as_oas = false) { - std::string fn = tl::testsrc () + "/testdata/dxf/" + file; - std::string fn_au = tl::testsrc () + std::string ("/testdata/dxf/") + file_au; + std::string fn = tl::testdata () + "/dxf/" + file; + std::string fn_au = tl::testdata () + std::string ("/dxf/") + file_au; do_run_test (_this, fn, fn_au, opt, as_oas); } diff --git a/src/plugins/streamers/gds2/unit_tests/dbGDS2Reader.cc b/src/plugins/streamers/gds2/unit_tests/dbGDS2Reader.cc index 6447871f6..fc652b8fd 100644 --- a/src/plugins/streamers/gds2/unit_tests/dbGDS2Reader.cc +++ b/src/plugins/streamers/gds2/unit_tests/dbGDS2Reader.cc @@ -355,20 +355,20 @@ TEST(Bug_121_1) db::Layout layout (&m); { - tl::InputStream file (tl::testsrc () + "/testdata/gds/bug_121a.gds"); + tl::InputStream file (tl::testdata () + "/gds/bug_121a.gds"); db::Reader reader (file); reader.read (layout); } { - tl::InputStream file (tl::testsrc () + "/testdata/gds/bug_121b.gds"); + tl::InputStream file (tl::testdata () + "/gds/bug_121b.gds"); db::Reader reader (file); reader.read (layout); } fflush(stdout); - std::string fn_au (tl::testsrc () + "/testdata/gds/bug_121_au1.gds"); + std::string fn_au (tl::testdata () + "/gds/bug_121_au1.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } @@ -378,18 +378,18 @@ TEST(Bug_121_2) db::Layout layout (&m); { - tl::InputStream file (tl::testsrc () + "/testdata/gds/bug_121a.gds"); + tl::InputStream file (tl::testdata () + "/gds/bug_121a.gds"); db::Reader reader (file); reader.read (layout); } { - tl::InputStream file (tl::testsrc () + "/testdata/gds/bug_121c.gds"); + tl::InputStream file (tl::testdata () + "/gds/bug_121c.gds"); db::Reader reader (file); reader.read (layout); } - std::string fn_au (tl::testsrc () + "/testdata/gds/bug_121_au2.gds"); + std::string fn_au (tl::testdata () + "/gds/bug_121_au2.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } @@ -411,7 +411,7 @@ TEST(3_AdvancedMapping) options.get_options ().layer_map = lm; { - tl::InputStream file (tl::testsrc () + "/testdata/gds/alm.gds"); + tl::InputStream file (tl::testdata () + "/gds/alm.gds"); db::Reader reader (file); lm_read = reader.read (layout, options); } @@ -429,7 +429,7 @@ TEST(3_AdvancedMapping) "100/0 : 200/0\n" ); - std::string fn_au (tl::testsrc () + "/testdata/gds/alm_au.gds"); + std::string fn_au (tl::testdata () + "/gds/alm_au.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } @@ -450,7 +450,7 @@ TEST(3_MultiMapping) options.get_options ().layer_map = lm; { - tl::InputStream file (tl::testsrc () + "/testdata/gds/alm.gds"); + tl::InputStream file (tl::testdata () + "/gds/alm.gds"); db::Reader reader (file); lm_read = reader.read (layout, options); } @@ -472,7 +472,7 @@ TEST(3_MultiMapping) "100/0 : 100/0\n" ); - std::string fn_au (tl::testsrc () + "/testdata/gds/alm_au2.gds"); + std::string fn_au (tl::testdata () + "/gds/alm_au2.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } @@ -494,7 +494,7 @@ TEST(3_MultiMapping2) options.get_options ().layer_map = lm; { - tl::InputStream file (tl::testsrc () + "/testdata/gds/t10.gds"); + tl::InputStream file (tl::testdata () + "/gds/t10.gds"); db::Reader reader (file); lm_read = reader.read (layout, options); } @@ -513,7 +513,7 @@ TEST(3_MultiMapping2) "8/1 : 8/1\n" ); - std::string fn_au (tl::testsrc () + "/testdata/gds/alm_au3.gds"); + std::string fn_au (tl::testdata () + "/gds/alm_au3.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } @@ -526,18 +526,18 @@ TEST(4_CollectModeRename) options.get_options ().cell_conflict_resolution = db::RenameCell; { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_basic.gds"); db::Reader reader (file); reader.read (layout, options); } { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_added.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_added.gds"); db::Reader reader (file); reader.read (layout, options); } - std::string fn_au (tl::testsrc () + "/testdata/gds/collect_rename_au.gds"); + std::string fn_au (tl::testdata () + "/gds/collect_rename_au.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } @@ -550,18 +550,18 @@ TEST(4_CollectModeRenameWithGhost) options.get_options ().cell_conflict_resolution = db::RenameCell; { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic_ag.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_basic_ag.gds"); db::Reader reader (file); reader.read (layout, options); } { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic_b.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_basic_b.gds"); db::Reader reader (file); reader.read (layout, options); } - std::string fn_au (tl::testsrc () + "/testdata/gds/collect_rename_au2.gds"); + std::string fn_au (tl::testdata () + "/gds/collect_rename_au2.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } @@ -574,18 +574,18 @@ TEST(4_CollectModeRenameWithGhostReverse) options.get_options ().cell_conflict_resolution = db::RenameCell; { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic_a.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_basic_a.gds"); db::Reader reader (file); reader.read (layout, options); } { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic_bg.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_basic_bg.gds"); db::Reader reader (file); reader.read (layout, options); } - std::string fn_au (tl::testsrc () + "/testdata/gds/collect_rename_au3.gds"); + std::string fn_au (tl::testdata () + "/gds/collect_rename_au3.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } @@ -598,18 +598,18 @@ TEST(4_CollectModeRenameWithGhostBoth) options.get_options ().cell_conflict_resolution = db::RenameCell; { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic_ag.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_basic_ag.gds"); db::Reader reader (file); reader.read (layout, options); } { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic_bg.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_basic_bg.gds"); db::Reader reader (file); reader.read (layout, options); } - std::string fn_au (tl::testsrc () + "/testdata/gds/collect_rename_au4.gds"); + std::string fn_au (tl::testdata () + "/gds/collect_rename_au4.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } @@ -622,18 +622,18 @@ TEST(4_CollectModeOverwrite) options.get_options ().cell_conflict_resolution = db::OverwriteCell; { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_basic.gds"); db::Reader reader (file); reader.read (layout, options); } { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_added.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_added.gds"); db::Reader reader (file); reader.read (layout, options); } - std::string fn_au (tl::testsrc () + "/testdata/gds/collect_overwrite_au.gds"); + std::string fn_au (tl::testdata () + "/gds/collect_overwrite_au.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } @@ -646,18 +646,18 @@ TEST(4_CollectModeSkip) options.get_options ().cell_conflict_resolution = db::SkipNewCell; { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_basic.gds"); db::Reader reader (file); reader.read (layout, options); } { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_added.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_added.gds"); db::Reader reader (file); reader.read (layout, options); } - std::string fn_au (tl::testsrc () + "/testdata/gds/collect_skip_au.gds"); + std::string fn_au (tl::testdata () + "/gds/collect_skip_au.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } @@ -670,18 +670,18 @@ TEST(4_CollectModeAdd) options.get_options ().cell_conflict_resolution = db::AddToCell; { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_basic.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_basic.gds"); db::Reader reader (file); reader.read (layout, options); } { - tl::InputStream file (tl::testsrc () + "/testdata/gds/collect_added.gds"); + tl::InputStream file (tl::testdata () + "/gds/collect_added.gds"); db::Reader reader (file); reader.read (layout, options); } - std::string fn_au (tl::testsrc () + "/testdata/gds/collect_add_au.gds"); + std::string fn_au (tl::testdata () + "/gds/collect_add_au.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } diff --git a/src/plugins/streamers/gds2/unit_tests/dbGDS2Writer.cc b/src/plugins/streamers/gds2/unit_tests/dbGDS2Writer.cc index c8869a18a..77c902223 100644 --- a/src/plugins/streamers/gds2/unit_tests/dbGDS2Writer.cc +++ b/src/plugins/streamers/gds2/unit_tests/dbGDS2Writer.cc @@ -36,8 +36,8 @@ void run_test (tl::TestBase *_this, const char *file, const char *file_ref, bool db::Manager m (false); db::Layout layout_org (&m); { - std::string fn (priv ? tl::testsrc_private () : tl::testsrc ()); - fn += "/testdata/gds/"; + std::string fn (priv ? tl::testdata_private () : tl::testdata ()); + fn += "/gds/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -64,8 +64,8 @@ void run_test (tl::TestBase *_this, const char *file, const char *file_ref, bool db::Layout layout_ref (&m); { - std::string fn (priv ? tl::testsrc_private () : tl::testsrc ()); - fn += "/testdata/gds/"; + std::string fn (priv ? tl::testdata_private () : tl::testdata ()); + fn += "/gds/"; fn += file_ref; tl::InputStream stream (fn); db::Reader reader (stream); @@ -134,8 +134,8 @@ TEST(3) db::Manager m (false); db::Layout layout_org (&m); { - std::string fn (tl::testsrc ()); - fn += "/testdata/other/d1.oas.gz"; + std::string fn (tl::testdata ()); + fn += "/other/d1.oas.gz"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (layout_org); @@ -193,8 +193,8 @@ TEST(4) db::Manager m (false); db::Layout layout_org (&m); { - std::string fn (tl::testsrc ()); - fn += "/testdata/other/d1.oas.gz"; + std::string fn (tl::testdata ()); + fn += "/other/d1.oas.gz"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (layout_org); diff --git a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc index 560712df3..f80484acc 100644 --- a/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc +++ b/src/plugins/streamers/lefdef/unit_tests/dbLEFDEFImportTests.cc @@ -52,8 +52,8 @@ static db::LEFDEFReaderOptions default_options () static db::LayerMap read (db::Layout &layout, const char *lef_dir, const char *filename, const db::LEFDEFReaderOptions &options, bool priv = true) { - std::string fn_path (priv ? tl::testsrc_private () : tl::testsrc ()); - fn_path += "/testdata/lefdef/"; + std::string fn_path (priv ? tl::testdata_private () : tl::testdata ()); + fn_path += "/lefdef/"; fn_path += lef_dir; fn_path += "/"; @@ -178,8 +178,8 @@ static db::LayerMap run_test (tl::TestBase *_this, const char *lef_dir, const ch if (au) { - std::string fn (priv ? tl::testsrc_private () : tl::testsrc ()); - fn += "/testdata/lefdef/"; + std::string fn (priv ? tl::testdata_private () : tl::testdata ()); + fn += "/lefdef/"; fn += lef_dir; fn += "/"; fn += au; @@ -777,8 +777,8 @@ TEST(200_lefdef_plugin) { db::Layout ly; - std::string fn_path (tl::testsrc ()); - fn_path += "/testdata/lefdef/masks-1/"; + std::string fn_path (tl::testdata ()); + fn_path += "/lefdef/masks-1/"; db::LEFDEFReaderOptions lefdef_opt = default_options (); lefdef_opt.set_map_file ("in.map"); @@ -798,8 +798,8 @@ TEST(201_lefdef_plugin_explicit_lef) { db::Layout ly; - std::string fn_path (tl::testsrc ()); - fn_path += "/testdata/lefdef/masks-1/"; + std::string fn_path (tl::testdata ()); + fn_path += "/lefdef/masks-1/"; db::LEFDEFReaderOptions lefdef_opt = default_options (); lefdef_opt.set_map_file ("in.map"); diff --git a/src/plugins/streamers/magic/unit_tests/dbMAGReader.cc b/src/plugins/streamers/magic/unit_tests/dbMAGReader.cc index 6a93d0614..d8fa23788 100644 --- a/src/plugins/streamers/magic/unit_tests/dbMAGReader.cc +++ b/src/plugins/streamers/magic/unit_tests/dbMAGReader.cc @@ -62,7 +62,7 @@ static void run_test (tl::TestBase *_this, const std::string &base, const char * { std::string fn (base); - fn += "/testdata/magic/"; + fn += "/magic/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -121,7 +121,7 @@ static void run_test (tl::TestBase *_this, const std::string &base, const char * { std::string fn (base); - fn += "/testdata/magic/"; + fn += "/magic/"; fn += file_au; tl::InputStream stream (fn); db::Reader reader (stream); @@ -141,18 +141,18 @@ static void run_test (tl::TestBase *_this, const std::string &base, const char * TEST(1) { - run_test (_this, tl::testsrc (), "MAG_TEST.mag.gz", "mag_test_au.cif.gz"); + run_test (_this, tl::testdata (), "MAG_TEST.mag.gz", "mag_test_au.cif.gz"); } TEST(2) { std::vector lp; lp.push_back (std::string ("../..")); - run_test (_this, tl::testsrc (), "PearlRiver/Layout/magic/PearlRiver_die.mag", "PearlRiver_au.cif.gz", 0, 1.0, 0.001, &lp); + run_test (_this, tl::testdata (), "PearlRiver/Layout/magic/PearlRiver_die.mag", "PearlRiver_au.cif.gz", 0, 1.0, 0.001, &lp); } TEST(3) { - run_test (_this, tl::testsrc (), "ringo/RINGO.mag", "ringo_au.cif.gz"); + run_test (_this, tl::testdata (), "ringo/RINGO.mag", "ringo_au.cif.gz"); } diff --git a/src/plugins/streamers/oasis/unit_tests/dbOASISReaderTests.cc b/src/plugins/streamers/oasis/unit_tests/dbOASISReaderTests.cc index d3a7ff83d..3aae2ca53 100644 --- a/src/plugins/streamers/oasis/unit_tests/dbOASISReaderTests.cc +++ b/src/plugins/streamers/oasis/unit_tests/dbOASISReaderTests.cc @@ -40,8 +40,8 @@ compare_ref (tl::TestBase *_this, const char *test, const db::Layout &layout) writer.write (layout); std::string oss = os.string (); - std::string fn_au (tl::testsrc ()); - fn_au += "/testdata/oasis/t"; + std::string fn_au (tl::testdata ()); + fn_au += "/oasis/t"; fn_au += test; fn_au += "_au.txt"; @@ -83,8 +83,8 @@ run_test (tl::TestBase *_this, const char *test) { db::Manager m (false); db::Layout layout (&m); - std::string fn (tl::testsrc ()); - fn += "/testdata/oasis/t"; + std::string fn (tl::testdata ()); + fn += "/oasis/t"; fn += test; fn += ".oas"; tl::InputStream stream (fn); @@ -108,8 +108,8 @@ run_test_error (tl::TestBase *_this, const char *test, const char *msg_au) { db::Manager m (false); db::Layout layout (&m); - std::string fn (tl::testsrc ()); - fn += "/testdata/oasis/t"; + std::string fn (tl::testdata ()); + fn += "/oasis/t"; fn += test; fn += ".oas"; tl::InputStream stream (fn); @@ -444,8 +444,8 @@ TEST(99) db::Layout layout (&m); { - std::string fn (tl::testsrc ()); - fn += "/testdata/oasis/t9.2.oas"; + std::string fn (tl::testdata ()); + fn += "/oasis/t9.2.oas"; tl::InputStream stream (fn); db::Reader reader (stream); reader.set_warnings_as_errors (true); @@ -461,8 +461,8 @@ TEST(99) } { - std::string fn (tl::testsrc ()); - fn += "/testdata/oasis/t8.7.oas"; + std::string fn (tl::testdata ()); + fn += "/oasis/t8.7.oas"; tl::InputStream stream (fn); db::Reader reader (stream); reader.set_warnings_as_errors (true); @@ -527,8 +527,8 @@ TEST(100) db::Layout layout (&m); { - std::string fn (tl::testsrc ()); - fn += "/testdata/oasis/xgeometry_test.oas"; + std::string fn (tl::testdata ()); + fn += "/oasis/xgeometry_test.oas"; tl::InputStream stream (fn); db::Reader reader (stream); reader.set_warnings_as_errors (true); @@ -549,18 +549,18 @@ TEST(Bug_121_1) db::Layout layout (&m); { - tl::InputStream file (tl::testsrc () + "/testdata/oasis/bug_121a.oas"); + tl::InputStream file (tl::testdata () + "/oasis/bug_121a.oas"); db::OASISReader reader (file); reader.read (layout); } { - tl::InputStream file (tl::testsrc () + "/testdata/oasis/bug_121b.oas"); + tl::InputStream file (tl::testdata () + "/oasis/bug_121b.oas"); db::OASISReader reader (file); reader.read (layout); } - std::string fn_au (tl::testsrc () + "/testdata/oasis/bug_121_au1.gds"); + std::string fn_au (tl::testdata () + "/oasis/bug_121_au1.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } @@ -570,17 +570,17 @@ TEST(Bug_121_2) db::Layout layout (&m); { - tl::InputStream file (tl::testsrc () + "/testdata/oasis/bug_121a.oas"); + tl::InputStream file (tl::testdata () + "/oasis/bug_121a.oas"); db::OASISReader reader (file); reader.read (layout); } { - tl::InputStream file (tl::testsrc () + "/testdata/oasis/bug_121c.oas"); + tl::InputStream file (tl::testdata () + "/oasis/bug_121c.oas"); db::OASISReader reader (file); reader.read (layout); } - std::string fn_au (tl::testsrc () + "/testdata/oasis/bug_121_au2.gds"); + std::string fn_au (tl::testdata () + "/oasis/bug_121_au2.gds"); db::compare_layouts (_this, layout, fn_au, db::WriteGDS2, 1); } diff --git a/src/plugins/streamers/oasis/unit_tests/dbOASISWriter.cc b/src/plugins/streamers/oasis/unit_tests/dbOASISWriter.cc index efe3e93ac..4c98d7cf6 100644 --- a/src/plugins/streamers/oasis/unit_tests/dbOASISWriter.cc +++ b/src/plugins/streamers/oasis/unit_tests/dbOASISWriter.cc @@ -38,8 +38,8 @@ void run_test (tl::TestBase *_this, const char *file, bool scaling_test, int com { db::Manager m (false); db::Layout layout_org (&m); - std::string fn (tl::testsrc ()); - fn += "/testdata/oasis/"; + std::string fn (tl::testdata ()); + fn += "/oasis/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -83,8 +83,8 @@ void run_test (tl::TestBase *_this, const char *file, bool scaling_test, int com { db::Manager m (false); db::Layout layout_org (&m); - std::string fn (tl::testsrc ()); - fn += "/testdata/oasis/"; + std::string fn (tl::testdata ()); + fn += "/oasis/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -139,8 +139,8 @@ void run_test (tl::TestBase *_this, const char *file, bool scaling_test, int com { db::Manager m (false); db::Layout layout_org (&m); - std::string fn (tl::testsrc ()); - fn += "/testdata/oasis/"; + std::string fn (tl::testdata ()); + fn += "/oasis/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -188,8 +188,8 @@ void run_test (tl::TestBase *_this, const char *file, bool scaling_test, int com { db::Manager m (false); db::Layout layout_org (&m); - std::string fn (tl::testsrc ()); - fn += "/testdata/oasis/"; + std::string fn (tl::testdata ()); + fn += "/oasis/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -239,8 +239,8 @@ void run_test (tl::TestBase *_this, const char *file, bool scaling_test, int com db::Manager m (false); db::Layout layout (&m); - std::string fn (tl::testsrc ()); - fn += "/testdata/oasis/"; + std::string fn (tl::testdata ()); + fn += "/oasis/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -1740,8 +1740,8 @@ TEST(119_WithAndWithoutContext) // Note: this sample requires the BASIC lib { - std::string fn (tl::testsrc ()); - fn += "/testdata/oasis/pcell_test.gds"; + std::string fn (tl::testdata ()); + fn += "/oasis/pcell_test.gds"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (g); @@ -1772,7 +1772,7 @@ TEST(119_WithAndWithoutContext) EXPECT_EQ (text_cell.get_display_name (), "Basic.TEXT(l=1/0,'KLAYOUT RULES')"); CHECKPOINT (); - db::compare_layouts (_this, gg, tl::testsrc () + "/testdata/oasis/dbOASISWriter119_au.gds", db::NoNormalization); + db::compare_layouts (_this, gg, tl::testdata () + "/oasis/dbOASISWriter119_au.gds", db::NoNormalization); } tmp_file = tl::TestBase::tmp_file (tl::sprintf ("tmp_dbOASISWriter119b.oas")); @@ -1801,7 +1801,7 @@ TEST(119_WithAndWithoutContext) EXPECT_EQ (text_cell.get_display_name (), "TEXT"); CHECKPOINT (); - db::compare_layouts (_this, gg, tl::testsrc () + "/testdata/oasis/dbOASISWriter119_au.gds", db::NoNormalization); + db::compare_layouts (_this, gg, tl::testdata () + "/oasis/dbOASISWriter119_au.gds", db::NoNormalization); } } diff --git a/src/plugins/streamers/oasis/unit_tests/dbOASISWriter2.cc b/src/plugins/streamers/oasis/unit_tests/dbOASISWriter2.cc index b4304658e..b51356266 100644 --- a/src/plugins/streamers/oasis/unit_tests/dbOASISWriter2.cc +++ b/src/plugins/streamers/oasis/unit_tests/dbOASISWriter2.cc @@ -37,8 +37,8 @@ TEST(1) db::Manager m (false); db::Layout layout_org (&m); { - std::string fn (tl::testsrc ()); - fn += "/testdata/other/d1.oas.gz"; + std::string fn (tl::testdata ()); + fn += "/other/d1.oas.gz"; tl::InputStream stream (fn); db::Reader reader (stream); reader.read (layout_org); diff --git a/src/plugins/streamers/pcb/unit_tests/dbGerberImport.cc b/src/plugins/streamers/pcb/unit_tests/dbGerberImport.cc index 33b7bde5d..3caad8042 100644 --- a/src/plugins/streamers/pcb/unit_tests/dbGerberImport.cc +++ b/src/plugins/streamers/pcb/unit_tests/dbGerberImport.cc @@ -44,8 +44,8 @@ static void run_test (tl::TestBase *_this, const char *dir) db::Layout layout; { - std::string fn (tl::testsrc_private ()); - fn += "/testdata/pcb/"; + std::string fn (tl::testdata_private ()); + fn += "/pcb/"; fn += dir; fn += "/import.pcb"; tl::InputStream stream (fn); @@ -53,7 +53,7 @@ static void run_test (tl::TestBase *_this, const char *dir) reader.read (layout, options); } - db::compare_layouts (_this, layout, tl::testsrc_private () + "/testdata/pcb/" + dir + "/au.oas.gz", db::WriteOAS, 1); + db::compare_layouts (_this, layout, tl::testdata_private () + "/pcb/" + dir + "/au.oas.gz", db::WriteOAS, 1); } TEST(0_Metadata) @@ -62,8 +62,8 @@ TEST(0_Metadata) std::string fn; - fn = tl::testsrc_private (); - fn += "/testdata/pcb/metadata/1.gbr"; + fn = tl::testdata_private (); + fn += "/pcb/metadata/1.gbr"; data = db::GerberImporter::scan (fn); EXPECT_EQ (data.creation_date, "2017-09-07T21:37;00+01:00"); @@ -74,8 +74,8 @@ TEST(0_Metadata) EXPECT_EQ (data.to_cu, 0); EXPECT_EQ (data.cu_layer_number, 1); - fn = tl::testsrc_private (); - fn += "/testdata/pcb/metadata/2.gbr"; + fn = tl::testdata_private (); + fn += "/pcb/metadata/2.gbr"; data = db::GerberImporter::scan (fn); EXPECT_EQ (data.creation_date, "2017-09-07T21:37;00+01:00"); @@ -86,8 +86,8 @@ TEST(0_Metadata) EXPECT_EQ (data.to_cu, 0); EXPECT_EQ (data.cu_layer_number, 4); - fn = tl::testsrc_private (); - fn += "/testdata/pcb/metadata/3.gbr"; + fn = tl::testdata_private (); + fn += "/pcb/metadata/3.gbr"; data = db::GerberImporter::scan (fn); EXPECT_EQ (data.creation_date, "2017-09-07T21:37;00+01:00"); @@ -98,8 +98,8 @@ TEST(0_Metadata) EXPECT_EQ (data.to_cu, 0); EXPECT_EQ (data.cu_layer_number, 2); - fn = tl::testsrc_private (); - fn += "/testdata/pcb/metadata/10.gbr"; + fn = tl::testdata_private (); + fn += "/pcb/metadata/10.gbr"; data = db::GerberImporter::scan (fn); EXPECT_EQ (data.creation_date, "2017-09-07T21:37;00+01:00"); @@ -110,8 +110,8 @@ TEST(0_Metadata) EXPECT_EQ (data.to_cu, 0); EXPECT_EQ (data.cu_layer_number, 0); - fn = tl::testsrc_private (); - fn += "/testdata/pcb/metadata/11.gbr"; + fn = tl::testdata_private (); + fn += "/pcb/metadata/11.gbr"; data = db::GerberImporter::scan (fn); EXPECT_EQ (data.creation_date, "2017-09-07T21:37;00+01:00"); @@ -122,8 +122,8 @@ TEST(0_Metadata) EXPECT_EQ (data.to_cu, 0); EXPECT_EQ (data.cu_layer_number, 0); - fn = tl::testsrc_private (); - fn += "/testdata/pcb/metadata/12.gbr"; + fn = tl::testdata_private (); + fn += "/pcb/metadata/12.gbr"; data = db::GerberImporter::scan (fn); EXPECT_EQ (data.creation_date, "2017-09-07T21:37;00+01:00"); @@ -134,8 +134,8 @@ TEST(0_Metadata) EXPECT_EQ (data.to_cu, 4); EXPECT_EQ (data.cu_layer_number, 0); - fn = tl::testsrc_private (); - fn += "/testdata/pcb/metadata/13.gbr"; + fn = tl::testdata_private (); + fn += "/pcb/metadata/13.gbr"; data = db::GerberImporter::scan (fn); EXPECT_EQ (data.creation_date, "2017-09-07T21:37;00+01:00"); @@ -146,8 +146,8 @@ TEST(0_Metadata) EXPECT_EQ (data.to_cu, 4); EXPECT_EQ (data.cu_layer_number, 0); - fn = tl::testsrc_private (); - fn += "/testdata/pcb/metadata/20.drl"; + fn = tl::testdata_private (); + fn += "/pcb/metadata/20.drl"; data = db::GerberImporter::scan (fn); EXPECT_EQ (data.creation_date, ""); diff --git a/src/plugins/tools/net_tracer/unit_tests/dbNetTracerTests.cc b/src/plugins/tools/net_tracer/unit_tests/dbNetTracerTests.cc index 780a9834d..926b53dd1 100644 --- a/src/plugins/tools/net_tracer/unit_tests/dbNetTracerTests.cc +++ b/src/plugins/tools/net_tracer/unit_tests/dbNetTracerTests.cc @@ -96,8 +96,8 @@ void run_test (tl::TestBase *_this, const std::string &file, const db::NetTracer db::Layout layout_org (&m); { - std::string fn (tl::testsrc ()); - fn += "/testdata/net_tracer/"; + std::string fn (tl::testdata ()); + fn += "/net_tracer/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -122,8 +122,8 @@ void run_test (tl::TestBase *_this, const std::string &file, const db::NetTracer db::Layout layout_net; net.export_net (layout_net, layout_net.cell (layout_net.add_cell ("NET"))); - std::string fn (tl::testsrc ()); - fn += "/testdata/net_tracer/"; + std::string fn (tl::testdata ()); + fn += "/net_tracer/"; fn += file_au; CHECKPOINT (); @@ -136,8 +136,8 @@ void run_test2 (tl::TestBase *_this, const std::string &file, const db::NetTrace db::Layout layout_org (&m); { - std::string fn (tl::testsrc ()); - fn += "/testdata/net_tracer/"; + std::string fn (tl::testdata ()); + fn += "/net_tracer/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -156,8 +156,8 @@ void run_test2 (tl::TestBase *_this, const std::string &file, const db::NetTrace db::Layout layout_net; net.export_net (layout_net, layout_net.cell (layout_net.add_cell ("NET"))); - std::string fn (tl::testsrc ()); - fn += "/testdata/net_tracer/"; + std::string fn (tl::testdata ()); + fn += "/net_tracer/"; fn += file_au; CHECKPOINT (); diff --git a/src/plugins/tools/net_tracer/unit_tests/dbTraceAllNets.cc b/src/plugins/tools/net_tracer/unit_tests/dbTraceAllNets.cc index afe2dd538..db2b8eca1 100644 --- a/src/plugins/tools/net_tracer/unit_tests/dbTraceAllNets.cc +++ b/src/plugins/tools/net_tracer/unit_tests/dbTraceAllNets.cc @@ -56,8 +56,8 @@ void run_test (tl::TestBase *_this, const std::string &file, const db::NetTracer db::Layout layout_org (&m); { - std::string fn (tl::testsrc ()); - fn += "/testdata/net_tracer/"; + std::string fn (tl::testdata ()); + fn += "/net_tracer/"; fn += file; tl::InputStream stream (fn); db::Reader reader (stream); @@ -80,8 +80,8 @@ void run_test (tl::TestBase *_this, const std::string &file, const db::NetTracer l2ndb.build_all_nets (cm, layout_nets, l2ndb.create_layermap (layout_nets, 1000), "NET_", tl::Variant (), db::LayoutToNetlist::BNH_SubcircuitCells, "CIRCUIT_", 0); - std::string fn (tl::testsrc ()); - fn += "/testdata/net_tracer/"; + std::string fn (tl::testdata ()); + fn += "/net_tracer/"; fn += file_au; CHECKPOINT (); diff --git a/src/pymod/unit_tests/pymod_tests.cc b/src/pymod/unit_tests/pymod_tests.cc index 2e9d1d590..83fdd0c5c 100644 --- a/src/pymod/unit_tests/pymod_tests.cc +++ b/src/pymod/unit_tests/pymod_tests.cc @@ -47,8 +47,8 @@ int run_pymodtest (tl::TestBase *_this, const std::string &fn) #endif tl::info << pypath; - std::string fp (tl::testsrc ()); - fp += "/testdata/pymod/"; + std::string fp (tl::testdata ()); + fp += "/pymod/"; fp += fn; std::string text; diff --git a/src/rdb/unit_tests/rdbRVEReaderTests.cc b/src/rdb/unit_tests/rdbRVEReaderTests.cc index bb4b6129c..5b78e4d62 100644 --- a/src/rdb/unit_tests/rdbRVEReaderTests.cc +++ b/src/rdb/unit_tests/rdbRVEReaderTests.cc @@ -31,7 +31,7 @@ void run_rve_test (tl::TestBase *_this, const std::string &fn_rve, const std::st rdb::Database db; { - tl::InputFile input (tl::testsrc_private () + "/testdata/rve/" + fn_rve); + tl::InputFile input (tl::testdata_private () + "/rve/" + fn_rve); tl::InputStream is (input); rdb::Reader reader (is); reader.read (db); @@ -40,7 +40,7 @@ void run_rve_test (tl::TestBase *_this, const std::string &fn_rve, const std::st std::string tmp = _this->tmp_file (); db.save (tmp); - std::string au_path = tl::absolute_file_path (tl::testsrc_private () + "/testdata/rve/" + fn_au); + std::string au_path = tl::absolute_file_path (tl::testdata_private () + "/rve/" + fn_au); std::string txt, au_txt; diff --git a/src/tl/tl/tlUnitTest.cc b/src/tl/tl/tlUnitTest.cc index 94a54988d..fb6f4ca8a 100644 --- a/src/tl/tl/tlUnitTest.cc +++ b/src/tl/tl/tlUnitTest.cc @@ -88,14 +88,21 @@ std::string testsrc () { std::string ts = tl::get_env ("TESTSRC"); if (ts.empty ()) { - throw tl::Exception ("TESTSRC undefined"); + tl::warn << "TESTSRC undefined"; + ts = "."; } return ts; } -std::string testsrc_private () +std::string testdata () +{ + return tl::combine_path (tl::testsrc (), "testdata"); +} + +std::string testdata_private () { std::string pp = tl::combine_path (tl::testsrc (), "private"); + pp = tl::combine_path (pp, "testdata"); if (! tl::file_exists (pp)) { throw tl::CancelException (); } diff --git a/src/tl/tl/tlUnitTest.h b/src/tl/tl/tlUnitTest.h index 91571882e..bf1844032 100644 --- a/src/tl/tl/tlUnitTest.h +++ b/src/tl/tl/tlUnitTest.h @@ -86,18 +86,24 @@ TL_PUBLIC bool is_debug_mode (); TL_PUBLIC void set_debug_mode (bool f); /** - * @brief Gets the path of the test data + * @brief Gets the path of the test source directory * This path is specified through the environment variable $TESTSRC */ TL_PUBLIC std::string testsrc (); +/** + * @brief Gets the path of the test data + * This path is given by "$TESTSRC/testdata" + */ +TL_PUBLIC std::string testdata (); + /** * @brief Gets the path of the private test data - * This path is specified through the environment variable $TESTSRC and the + * This path is specified through the environment variable $TESTSRC, "testdata" subdirectory and the * private testdata directory. If no private test data is available, this * method will throw a CancelException which makes the test skipped. */ -TL_PUBLIC std::string testsrc_private (); +TL_PUBLIC std::string testdata_private (); /** * @brief Gets the path to the temporary data diff --git a/src/tl/unit_tests/tlIncludeTests.cc b/src/tl/unit_tests/tlIncludeTests.cc index a0bdc6d69..da681c43e 100644 --- a/src/tl/unit_tests/tlIncludeTests.cc +++ b/src/tl/unit_tests/tlIncludeTests.cc @@ -33,7 +33,7 @@ static std::string np (const std::string &s) TEST(1_simple) { - std::string fn = tl::testsrc () + "/testdata/tl/x.txt"; + std::string fn = tl::testdata () + "/tl/x.txt"; std::string et; tl::IncludeExpander ie = tl::IncludeExpander::expand (fn, et); @@ -47,18 +47,18 @@ TEST(1_simple) TEST(2_single_include) { - std::string fn = tl::testsrc () + "/testdata/tl/x_inc1.txt"; + std::string fn = tl::testdata () + "/tl/x_inc1.txt"; std::string et; tl::IncludeExpander ie = tl::IncludeExpander::expand (fn, tl::InputStream (fn).read_all (), et); EXPECT_EQ (et, "A line\nincluded.1\nAnother line\n"); - EXPECT_EQ (np (ie.to_string ()), np ("@1*" + tl::testsrc () + "/testdata/tl/x_inc1.txt*0;2*" + tl::testsrc () + "/testdata/tl/inc1.txt*-1;3*" + tl::testsrc () + "/testdata/tl/x_inc1.txt*0;")); + EXPECT_EQ (np (ie.to_string ()), np ("@1*" + tl::testdata () + "/tl/x_inc1.txt*0;2*" + tl::testdata () + "/tl/inc1.txt*-1;3*" + tl::testdata () + "/tl/x_inc1.txt*0;")); EXPECT_EQ (tl::IncludeExpander::from_string (ie.to_string ()).to_string (), ie.to_string ()); EXPECT_EQ (ie.translate_to_original (1).first, fn); EXPECT_EQ (ie.translate_to_original (1).second, 1); - EXPECT_EQ (np (ie.translate_to_original (2).first), np (tl::testsrc () + "/testdata/tl/inc1.txt")); + EXPECT_EQ (np (ie.translate_to_original (2).first), np (tl::testdata () + "/tl/inc1.txt")); EXPECT_EQ (ie.translate_to_original (2).second, 1); EXPECT_EQ (ie.translate_to_original (3).first, fn); EXPECT_EQ (ie.translate_to_original (3).second, 3); @@ -66,7 +66,7 @@ TEST(2_single_include) TEST(3_multi_include) { - std::string fn = tl::testsrc () + "/testdata/tl/x_inc3.txt"; + std::string fn = tl::testdata () + "/tl/x_inc3.txt"; std::string et; tl::IncludeExpander ie = tl::IncludeExpander::expand (fn, et); @@ -76,11 +76,11 @@ TEST(3_multi_include) EXPECT_EQ (ie.translate_to_original (1).first, fn); EXPECT_EQ (ie.translate_to_original (1).second, 1); - EXPECT_EQ (np (ie.translate_to_original (2).first), np (tl::testsrc () + "/testdata/tl/inc3.txt")); + EXPECT_EQ (np (ie.translate_to_original (2).first), np (tl::testdata () + "/tl/inc3.txt")); EXPECT_EQ (ie.translate_to_original (2).second, 1); - EXPECT_EQ (np (ie.translate_to_original (3).first), np (tl::testsrc () + "/testdata/tl/inc2.txt")); + EXPECT_EQ (np (ie.translate_to_original (3).first), np (tl::testdata () + "/tl/inc2.txt")); EXPECT_EQ (ie.translate_to_original (3).second, 1); - EXPECT_EQ (np (ie.translate_to_original (5).first), np (tl::testsrc () + "/testdata/tl/inc3.txt")); + EXPECT_EQ (np (ie.translate_to_original (5).first), np (tl::testdata () + "/tl/inc3.txt")); EXPECT_EQ (ie.translate_to_original (5).second, 3); EXPECT_EQ (ie.translate_to_original (6).first, fn); EXPECT_EQ (ie.translate_to_original (6).second, 3); @@ -88,7 +88,7 @@ TEST(3_multi_include) TEST(4_multi_include_interpolate) { - std::string fn = tl::testsrc () + "/testdata/tl/x_inc3_ip.txt"; + std::string fn = tl::testdata () + "/tl/x_inc3_ip.txt"; std::string et; tl::IncludeExpander ie = tl::IncludeExpander::expand (fn, et); @@ -98,11 +98,11 @@ TEST(4_multi_include_interpolate) EXPECT_EQ (ie.translate_to_original (1).first, fn); EXPECT_EQ (ie.translate_to_original (1).second, 1); - EXPECT_EQ (np (ie.translate_to_original (2).first), np (tl::testsrc () + "/testdata/tl/inc3.txt")); + EXPECT_EQ (np (ie.translate_to_original (2).first), np (tl::testdata () + "/tl/inc3.txt")); EXPECT_EQ (ie.translate_to_original (2).second, 1); - EXPECT_EQ (np (ie.translate_to_original (3).first), np (tl::testsrc () + "/testdata/tl/inc2.txt")); + EXPECT_EQ (np (ie.translate_to_original (3).first), np (tl::testdata () + "/tl/inc2.txt")); EXPECT_EQ (ie.translate_to_original (3).second, 1); - EXPECT_EQ (np (ie.translate_to_original (5).first), np (tl::testsrc () + "/testdata/tl/inc3.txt")); + EXPECT_EQ (np (ie.translate_to_original (5).first), np (tl::testdata () + "/tl/inc3.txt")); EXPECT_EQ (ie.translate_to_original (5).second, 3); EXPECT_EQ (ie.translate_to_original (6).first, fn); EXPECT_EQ (ie.translate_to_original (6).second, 3);