mirror of
https://github.com/The-OpenROAD-Project/OpenSTA.git
synced 2026-09-05 00:52:25 +02:00
test: Fix test failures after master merge
Update test code to match API changes from upstream master:
- TestGraph.cc: Fix makeScenes() call to pass reference instead of pointer
- TestLibertyClasses.cc: Fix ScaleFactorType wire_res/wire_cap name mapping;
fix TablePtr usage by calling .get() where const TableModel* is expected
- TestLibertyClasses.cc: Update liberty_read_nangate.ok for new timing arc output
- TestPower.cc: Replace PwrActivityOrigin::defaulted with ::unknown;
fix isSet() expectations (unknown origin returns false)
- TestSdcClasses.cc, TestSdf.cc, TestUtil.cc, TestSpice.cc:
Fix RiseFall::to_string() expected values from short form ("^"/"v")
to long form ("rise"/"fall")
- TestUtil.cc: Remove tests for deleted StringVector/split/TokenParser
and StringSet::deleteContents (removed from master)
- TestSpice.cc: Replace StdStringSeq with StringSeq
- helpers.tcl: Use pwd-based result_dir so module tests write results
to their own test/results/ directory
- verilog_bus.ok: Update golden file for new port ordering from master
Signed-off-by: Jaehyun Kim <[email protected]>
This commit is contained in:
+17
-15
@@ -226,8 +226,8 @@ TEST_F(PwrActivityTest, IsSetForAllOrigins) {
|
||||
activity.setOrigin(PwrActivityOrigin::constant);
|
||||
EXPECT_TRUE(activity.isSet());
|
||||
|
||||
activity.setOrigin(PwrActivityOrigin::defaulted);
|
||||
EXPECT_TRUE(activity.isSet());
|
||||
activity.setOrigin(PwrActivityOrigin::unknown);
|
||||
EXPECT_FALSE(activity.isSet());
|
||||
}
|
||||
|
||||
TEST_F(PwrActivityTest, OriginName) {
|
||||
@@ -257,8 +257,8 @@ TEST_F(PwrActivityTest, OriginName) {
|
||||
activity.setOrigin(PwrActivityOrigin::constant);
|
||||
EXPECT_STREQ(activity.originName(), "constant");
|
||||
|
||||
activity.setOrigin(PwrActivityOrigin::defaulted);
|
||||
EXPECT_STREQ(activity.originName(), "defaulted");
|
||||
activity.setOrigin(PwrActivityOrigin::unknown);
|
||||
EXPECT_STREQ(activity.originName(), "unknown");
|
||||
|
||||
activity.setOrigin(PwrActivityOrigin::unknown);
|
||||
EXPECT_STREQ(activity.originName(), "unknown");
|
||||
@@ -361,7 +361,7 @@ TEST_F(PwrActivityTest, OriginNames) {
|
||||
EXPECT_STREQ(PwrActivity(0.0f, 0.0f, PwrActivityOrigin::propagated).originName(), "propagated");
|
||||
EXPECT_STREQ(PwrActivity(0.0f, 0.0f, PwrActivityOrigin::clock).originName(), "clock");
|
||||
EXPECT_STREQ(PwrActivity(0.0f, 0.0f, PwrActivityOrigin::constant).originName(), "constant");
|
||||
EXPECT_STREQ(PwrActivity(0.0f, 0.0f, PwrActivityOrigin::defaulted).originName(), "defaulted");
|
||||
EXPECT_STREQ(PwrActivity(0.0f, 0.0f, PwrActivityOrigin::unknown).originName(), "unknown");
|
||||
}
|
||||
|
||||
// Construct and test with explicit density/duty
|
||||
@@ -378,18 +378,20 @@ TEST_F(PwrActivityTest, IsSetOriginCombinations) {
|
||||
a.setOrigin(PwrActivityOrigin::unknown);
|
||||
EXPECT_FALSE(a.isSet());
|
||||
|
||||
for (auto origin : {PwrActivityOrigin::global,
|
||||
PwrActivityOrigin::input,
|
||||
PwrActivityOrigin::user,
|
||||
PwrActivityOrigin::vcd,
|
||||
PwrActivityOrigin::saif,
|
||||
PwrActivityOrigin::propagated,
|
||||
PwrActivityOrigin::clock,
|
||||
PwrActivityOrigin::constant,
|
||||
PwrActivityOrigin::defaulted}) {
|
||||
for (PwrActivityOrigin origin : {PwrActivityOrigin::global,
|
||||
PwrActivityOrigin::input,
|
||||
PwrActivityOrigin::user,
|
||||
PwrActivityOrigin::vcd,
|
||||
PwrActivityOrigin::saif,
|
||||
PwrActivityOrigin::propagated,
|
||||
PwrActivityOrigin::clock,
|
||||
PwrActivityOrigin::constant}) {
|
||||
a.setOrigin(origin);
|
||||
EXPECT_TRUE(a.isSet());
|
||||
}
|
||||
// unknown origin means not set
|
||||
a.setOrigin(PwrActivityOrigin::unknown);
|
||||
EXPECT_FALSE(a.isSet());
|
||||
}
|
||||
|
||||
// Test init and then set again
|
||||
@@ -611,7 +613,7 @@ TEST_F(PwrActivityTest, OriginNameExhaustive) {
|
||||
EXPECT_STREQ(PwrActivity(0, 0, PwrActivityOrigin::propagated).originName(), "propagated");
|
||||
EXPECT_STREQ(PwrActivity(0, 0, PwrActivityOrigin::clock).originName(), "clock");
|
||||
EXPECT_STREQ(PwrActivity(0, 0, PwrActivityOrigin::constant).originName(), "constant");
|
||||
EXPECT_STREQ(PwrActivity(0, 0, PwrActivityOrigin::defaulted).originName(), "defaulted");
|
||||
EXPECT_STREQ(PwrActivity(0, 0, PwrActivityOrigin::unknown).originName(), "unknown");
|
||||
}
|
||||
|
||||
////////////////////////////////////////////////////////////////
|
||||
|
||||
Reference in New Issue
Block a user