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

Added missing dependency and compatibility with -pedantic

This commit is contained in:
Matthias Koefferlein 2017-08-21 01:01:47 +02:00
parent 97412b1adb
commit edae27b9aa
7 changed files with 112 additions and 112 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/buddies/unit_tests/bdBasicTests.cc
View File

@ -158,10 +158,10 @@ TEST(2)
db::SaveLayoutOptions stream_opt;
{
char *argv[] = { "x",
"--write-cells=A,-C,(C)",
};
cmd.parse (sizeof (argv) / sizeof (argv[0]), argv);
const char *argv[] = { "x",
"--write-cells=A,-C,(C)",
};
cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv);
}
opt.configure (stream_opt, layout);
@ -173,10 +173,10 @@ TEST(2)
EXPECT_EQ (cells2string (layout, cells), "A,B,C");
{
char *argv[] = { "x",
"--write-cells=(C),(TOP)",
};
cmd.parse (sizeof (argv) / sizeof (argv[0]), argv);
const char *argv[] = { "x",
"--write-cells=(C),(TOP)",
};
cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv);
}
opt.configure (stream_opt, layout);
@ -188,10 +188,10 @@ TEST(2)
EXPECT_EQ (cells2string (layout, cells), "TOP,C");
{
char *argv[] = { "x",
"--write-cells=(TOP),+B",
};
cmd.parse (sizeof (argv) / sizeof (argv[0]), argv);
const char *argv[] = { "x",
"--write-cells=(TOP),+B",
};
cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv);
}
opt.configure (stream_opt, layout);
@ -211,34 +211,34 @@ TEST(10)
opt.add_options (cmd);
char *argv[] = { "x",
// CIF and DXF
"-id=0.125",
// CIF
"-iw=1",
// DXF
"-iu=2.5",
"--dxf-circle-accuracy=0.5",
"--dxf-circle-points=1000",
"--dxf-keep-other-cells",
"--dxf-polyline-mode=3",
"--dxf-render-texts-as-polygons",
"--dxf-text-scaling=75",
// GDS2 and OASIS
"--no-properties",
"--no-texts",
// GDS2
"-ib=3",
"--no-big-records",
"--no-multi-xy-records",
// General
"-im=1/0 3,4/0-255 A:17/0",
"-is",
// OASIS
"--expect-strict-mode=1"
};
const char *argv[] = { "x",
// CIF and DXF
"-id=0.125",
// CIF
"-iw=1",
// DXF
"-iu=2.5",
"--dxf-circle-accuracy=0.5",
"--dxf-circle-points=1000",
"--dxf-keep-other-cells",
"--dxf-polyline-mode=3",
"--dxf-render-texts-as-polygons",
"--dxf-text-scaling=75",
// GDS2 and OASIS
"--no-properties",
"--no-texts",
// GDS2
"-ib=3",
"--no-big-records",
"--no-multi-xy-records",
// General
"-im=1/0 3,4/0-255 A:17/0",
"-is",
// OASIS
"--expect-strict-mode=1"
};
cmd.parse (sizeof (argv) / sizeof (argv[0]), argv);
cmd.parse (sizeof (argv) / sizeof (argv[0]), (char **) argv);
db::LoadLayoutOptions stream_opt;
EXPECT_EQ (tl::to_string (stream_opt.get_options<db::CIFReaderOptions> ().dbu), "0.001");

20
src/buddies/unit_tests/bdConverterTests.cc
View File

@ -36,9 +36,9 @@ TEST(1)
std::string output = this->tmp_file ();
char *argv[] = { "x", const_cast<char *> (input.c_str ()), const_cast<char *> (output.c_str ()) };
const char *argv[] = { "x", input.c_str (), output.c_str () };
EXPECT_EQ (bd::converter_main (sizeof (argv) / sizeof (argv[0]), argv, db::CIFReaderOptions ().format_name ()), 0);
EXPECT_EQ (bd::converter_main (sizeof (argv) / sizeof (argv[0]), (char **) argv, db::CIFReaderOptions ().format_name ()), 0);
db::Layout layout;
@ -59,9 +59,9 @@ TEST(2)
std::string output = this->tmp_file ();
char *argv[] = { "x", const_cast<char *> (input.c_str ()), const_cast<char *> (output.c_str ()) };
const char *argv[] = { "x", input.c_str (), output.c_str () };
EXPECT_EQ (bd::converter_main (sizeof (argv) / sizeof (argv[0]), argv, db::DXFReaderOptions ().format_name ()), 0);
EXPECT_EQ (bd::converter_main (sizeof (argv) / sizeof (argv[0]), (char **) argv, db::DXFReaderOptions ().format_name ()), 0);
db::Layout layout;
@ -88,9 +88,9 @@ TEST(3)
std::string output = this->tmp_file ();
char *argv[] = { "x", const_cast<char *> (input.c_str ()), const_cast<char *> (output.c_str ()) };
const char *argv[] = { "x", input.c_str (), output.c_str () };
EXPECT_EQ (bd::converter_main (sizeof (argv) / sizeof (argv[0]), argv, db::GDS2ReaderOptions ().format_name ()), 0);
EXPECT_EQ (bd::converter_main (sizeof (argv) / sizeof (argv[0]), (char **) argv, db::GDS2ReaderOptions ().format_name ()), 0);
db::Layout layout;
@ -111,9 +111,9 @@ TEST(4)
std::string output = this->tmp_file ();
char *argv[] = { "x", const_cast<char *> (input.c_str ()), const_cast<char *> (output.c_str ()) };
const char *argv[] = { "x", input.c_str (), output.c_str () };
EXPECT_EQ (bd::converter_main (sizeof (argv) / sizeof (argv[0]), argv, db::GDS2ReaderOptions ().format_name () + "Text"), 0);
EXPECT_EQ (bd::converter_main (sizeof (argv) / sizeof (argv[0]), (char **) argv, db::GDS2ReaderOptions ().format_name () + "Text"), 0);
db::Layout layout;
@ -134,9 +134,9 @@ TEST(5)
std::string output = this->tmp_file ();
char *argv[] = { "x", const_cast<char *> (input.c_str ()), const_cast<char *> (output.c_str ()) };
const char *argv[] = { "x", input.c_str (), output.c_str () };
EXPECT_EQ (bd::converter_main (sizeof (argv) / sizeof (argv[0]), argv, db::OASISReaderOptions ().format_name ()), 0);
EXPECT_EQ (bd::converter_main (sizeof (argv) / sizeof (argv[0]), (char **) argv, db::OASISReaderOptions ().format_name ()), 0);
db::Layout layout;

4
src/buddies/unit_tests/bdStrm2txtTests.cc
View File

@ -35,9 +35,9 @@ TEST(1)
std::string output = this->tmp_file ();
char *argv[] = { "x", const_cast<char *> (input.c_str ()), const_cast<char *> (output.c_str ()) };
const char *argv[] = { "x", input.c_str (), output.c_str () };
EXPECT_EQ (strm2txt (sizeof (argv) / sizeof (argv[0]), argv), 0);
EXPECT_EQ (strm2txt (sizeof (argv) / sizeof (argv[0]), (char **) argv), 0);
this->compare_text_files (output, au);
}

12
src/buddies/unit_tests/bdStrmclipTests.cc
View File

@ -36,9 +36,9 @@ TEST(1A)
std::string output = this->tmp_file ();
char *argv[] = { "x", const_cast<char *> (input.c_str ()), const_cast<char *> (output.c_str ()), "-r=0,-2,9,5", "-r=13,-2,16,3", "-r=13,5,16,7" };
const char *argv[] = { "x", input.c_str (), output.c_str (), "-r=0,-2,9,5", "-r=13,-2,16,3", "-r=13,5,16,7" };
EXPECT_EQ (strmclip (sizeof (argv) / sizeof (argv[0]), argv), 0);
EXPECT_EQ (strmclip (sizeof (argv) / sizeof (argv[0]), (char **) argv), 0);
db::Layout layout;
@ -61,9 +61,9 @@ TEST(1B)
std::string output = this->tmp_file ();
char *argv[] = { "x", const_cast<char *> (input.c_str ()), const_cast<char *> (output.c_str ()), "-l=100/0" };
const char *argv[] = { "x", input.c_str (), output.c_str (), "-l=100/0" };
EXPECT_EQ (strmclip (sizeof (argv) / sizeof (argv[0]), argv), 0);
EXPECT_EQ (strmclip (sizeof (argv) / sizeof (argv[0]), (char **) argv), 0);
db::Layout layout;
@ -86,9 +86,9 @@ TEST(2)
std::string output = this->tmp_file ();
char *argv[] = { "x", const_cast<char *> (input.c_str ()), const_cast<char *> (output.c_str ()), "-r=0,-2,9,5", "-t", "INV2", "-x=CLIP_OUT" };
const char *argv[] = { "x", input.c_str (), output.c_str (), "-r=0,-2,9,5", "-t", "INV2", "-x=CLIP_OUT" };
EXPECT_EQ (strmclip (sizeof (argv) / sizeof (argv[0]), argv), 0);
EXPECT_EQ (strmclip (sizeof (argv) / sizeof (argv[0]), (char **) argv), 0);
db::Layout layout;

84
src/buddies/unit_tests/bdStrmcmpTests.cc
View File

@ -45,9 +45,9 @@ TEST(1)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref1.gds";
char *argv[] = { "x", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 0);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 0);
EXPECT_EQ (cap.captured_text (), "");
}
@ -62,9 +62,9 @@ TEST(2A)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref2.gds";
char *argv[] = { "x", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
EXPECT_EQ (cap.captured_text (),
"Boxes differ for layer 8/0 in cell RINGO\n"
@ -91,9 +91,9 @@ TEST(2B)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref2.gds";
char *argv[] = { "x", "-s", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "-s", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
EXPECT_EQ (cap.captured_text (), "");
}
@ -108,9 +108,9 @@ TEST(2C)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref2.gds";
char *argv[] = { "x", "-am=8/0", "-as", "-bm=8/0", "-bs", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "-am=8/0", "-as", "-bm=8/0", "-bs", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
EXPECT_EQ (cap.captured_text (),
"Boxes differ for layer 8/0 in cell RINGO\n"
@ -132,9 +132,9 @@ TEST(2D)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref2.gds";
char *argv[] = { "x", "-m=1", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "-m=1", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
EXPECT_EQ (cap.captured_text (),
"...\n"
@ -153,9 +153,9 @@ TEST(2E)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref2.gds";
char *argv[] = { "x", "-ta=INV2", "-tb=INV2", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "-ta=INV2", "-tb=INV2", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 0);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 0);
}
TEST(2F)
@ -168,9 +168,9 @@ TEST(2F)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref2.gds";
char *argv[] = { "x", "-u", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "-u", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
EXPECT_EQ (cap.captured_text (),
"Bounding boxes differ for cell RINGO, (-1720,-800;25160,3800) vs. (-1700,-800;25160,3800)\n"
@ -191,9 +191,9 @@ TEST(3A)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref3.gds";
char *argv[] = { "x", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
EXPECT_EQ (cap.captured_text (),
"Boxes differ for layer 8/0 in cell RINGO\n"
@ -215,9 +215,9 @@ TEST(3B)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref3.gds";
char *argv[] = { "x", "-t=0.001", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "-t=0.001", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 0);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 0);
}
TEST(4A)
@ -230,9 +230,9 @@ TEST(4A)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref4.gds";
char *argv[] = { "x", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
EXPECT_EQ (cap.captured_text (),
"Paths differ for layer 3/0 in cell TRANS\n"
@ -257,9 +257,9 @@ TEST(4B)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref4.gds";
char *argv[] = { "x", "-p", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "-p", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 0);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 0);
}
TEST(5A)
@ -272,9 +272,9 @@ TEST(5A)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref5.gds";
char *argv[] = { "x", "-u", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "-u", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
EXPECT_EQ (cap.captured_text (),
"Instances differ in cell RINGO\n"
@ -292,9 +292,9 @@ TEST(5B)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref5.gds";
char *argv[] = { "x", "--expand-arrays", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "--expand-arrays", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 0);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 0);
}
TEST(6A)
@ -307,9 +307,9 @@ TEST(6A)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref6.gds";
char *argv[] = { "x", "-r", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "-r", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
EXPECT_EQ (cap.captured_text (),
"Boxes differ for layer 8/0 in cell RINGO\n"
@ -331,9 +331,9 @@ TEST(6B)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref6.gds";
char *argv[] = { "x", "-np", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "-np", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 0);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 0);
}
TEST(7A)
@ -346,9 +346,9 @@ TEST(7A)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref7.oas";
char *argv[] = { "x", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
EXPECT_EQ (cap.captured_text (),
"Layer names differ between layout a and b for layer 3/0: vs. NAME\n"
@ -366,9 +366,9 @@ TEST(7B)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref7.oas";
char *argv[] = { "x", "-nl", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "-nl", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 0);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 0);
}
TEST(8A)
@ -381,9 +381,9 @@ TEST(8A)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref8.gds";
char *argv[] = { "x", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
EXPECT_EQ (cap.captured_text (),
"Cell TRANS is not present in layout b, but in a\n"
@ -413,9 +413,9 @@ TEST(8B)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref8.gds";
char *argv[] = { "x", "-c", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "-c", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 0);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 0);
EXPECT_EQ (cap.captured_text (),
"Cell TRANS in a is renamed to SNART in b\n"
@ -432,9 +432,9 @@ TEST(9A)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref9.gds";
char *argv[] = { "x", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
EXPECT_EQ (cap.captured_text (),
"Layer 8/1 is not present in layout b, but in a\n"
@ -452,9 +452,9 @@ TEST(9B)
std::string input_b = ut::testsrc ();
input_b += "/testdata/bd/strmcmp_ref9.gds";
char *argv[] = { "x", "-l", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()) };
const char *argv[] = { "x", "-l", input_a.c_str (), input_b.c_str () };
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmcmp (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
EXPECT_EQ (cap.captured_text (),
"Texts differ for layer 8/1 in cell RINGO\n"

24
src/buddies/unit_tests/bdStrmxorTests.cc
View File

@ -44,9 +44,9 @@ TEST(1)
std::string output = this->tmp_file ("tmp.oas");
char *argv[] = { "x", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()), const_cast<char *> (output.c_str ()) };
const char *argv[] = { "x", input_a.c_str (), input_b.c_str (), output.c_str () };
EXPECT_EQ (strmxor (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmxor (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
db::Layout layout;
@ -77,9 +77,9 @@ TEST(2)
std::string output = this->tmp_file ("tmp.oas");
char *argv[] = { "x", "-l", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()), const_cast<char *> (output.c_str ()) };
const char *argv[] = { "x", "-l", input_a.c_str (), input_b.c_str (), output.c_str () };
EXPECT_EQ (strmxor (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmxor (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
db::Layout layout;
@ -110,9 +110,9 @@ TEST(3)
std::string output = this->tmp_file ("tmp.oas");
char *argv[] = { "x", "-p=1.0", "-n=4", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()), const_cast<char *> (output.c_str ()) };
const char *argv[] = { "x", "-p=1.0", "-n=4", input_a.c_str (), input_b.c_str (), output.c_str () };
EXPECT_EQ (strmxor (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmxor (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
db::Layout layout;
@ -143,9 +143,9 @@ TEST(4)
std::string output = this->tmp_file ("tmp.oas");
char *argv[] = { "x", "-p=1.0", "-n=4", "-t=0.0,0.005,0.01,0.02,0.09,0.1", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()), const_cast<char *> (output.c_str ()) };
const char *argv[] = { "x", "-p=1.0", "-n=4", "-t=0.0,0.005,0.01,0.02,0.09,0.1", input_a.c_str (), input_b.c_str (), output.c_str () };
EXPECT_EQ (strmxor (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmxor (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
db::Layout layout;
@ -176,9 +176,9 @@ TEST(5)
std::string output = this->tmp_file ("tmp.oas");
char *argv[] = { "x", "-b=1000", "-t=0.0,0.005,0.01,0.02,0.09,0.1", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()), const_cast<char *> (output.c_str ()) };
const char *argv[] = { "x", "-b=1000", "-t=0.0,0.005,0.01,0.02,0.09,0.1", input_a.c_str (), input_b.c_str (), output.c_str () };
EXPECT_EQ (strmxor (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmxor (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
db::Layout layout;
@ -209,9 +209,9 @@ TEST(6)
std::string output = this->tmp_file ("tmp.oas");
char *argv[] = { "x", "-ta=INV2", "-tb=2VNI", const_cast<char *> (input_a.c_str ()), const_cast<char *> (input_b.c_str ()), const_cast<char *> (output.c_str ()) };
const char *argv[] = { "x", "-ta=INV2", "-tb=2VNI", input_a.c_str (), input_b.c_str (), output.c_str () };
EXPECT_EQ (strmxor (sizeof (argv) / sizeof (argv[0]), argv), 1);
EXPECT_EQ (strmxor (sizeof (argv) / sizeof (argv[0]), (char **) argv), 1);
db::Layout layout;

2
src/klayout.pro
View File

@ -45,7 +45,7 @@ ant.depends += laybasic
img.depends += laybasic
edt.depends += laybasic
buddies.depends += db tl gsi
buddies.depends += db tl gsi ut
lay.depends += laybasic ant img edt
equals(HAVE_RUBY, "1") {