Skip to content

Commit 4907768

Browse files
committed
[sw/silicon_creator] Use EXPECT_DEATH in unit tests
Fixes lowRISC#10549 Signed-off-by: Alphan Ulusoy <[email protected]>
1 parent 4810dd7 commit 4907768

File tree

5 files changed

+20
-21
lines changed

5 files changed

+20
-21
lines changed

sw/device/silicon_creator/lib/base/sec_mmio_unittest.cc

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -173,54 +173,53 @@ TEST_F(SecMmioTest, CheckCount) {
173173
EXPECT_EQ(ctx_->check_count, 2);
174174
}
175175

176-
// Negative test cases trigger assertions, which are caugth by `ASSERT_DEATH`
177-
// calls. All test cases use lambda functions to wrap expectations and work
178-
// around issue google/googletest#1004.
176+
// Negative test cases trigger assertions, which are caugth by `EXPECT_DEATH`
177+
// calls.
179178
class SecMmioDeathTest : public SecMmioTest {};
180179

181180
TEST_F(SecMmioDeathTest, Read32OrDieSimulatedFault) {
182-
ASSERT_DEATH(
183-
[] {
181+
EXPECT_DEATH(
182+
{
184183
EXPECT_ABS_READ32(0, 0x12345678);
185184
EXPECT_ABS_READ32(0, 0);
186185
sec_mmio_read32(0);
187-
}(),
186+
},
188187
"");
189188
}
190189

191190
TEST_F(SecMmioDeathTest, Write32SimulatedFault) {
192-
ASSERT_DEATH(
193-
[] {
191+
EXPECT_DEATH(
192+
{
194193
EXPECT_ABS_WRITE32(0, 0x12345678);
195194
EXPECT_ABS_READ32(0, 0);
196195
sec_mmio_write32(0, 0x12345678);
197-
}(),
196+
},
198197
"");
199198
}
200199

201200
TEST_F(SecMmioDeathTest, CheckValuesSimulatedFault) {
202-
ASSERT_DEATH(
203-
[] {
201+
EXPECT_DEATH(
202+
{
204203
EXPECT_ABS_WRITE32(0, 0x12345678);
205204
EXPECT_ABS_READ32(0, 0x12345678);
206205
sec_mmio_write32(0, 0x12345678);
207206

208207
EXPECT_ABS_READ32(0, 0);
209208
sec_mmio_check_values(/*rnd_offset=*/0);
210-
}(),
209+
},
211210
"");
212211
}
213212

214213
TEST_F(SecMmioDeathTest, CheckCountWriteMismatch) {
215214
// The developer forgot to increment the write counter, or an attacker
216215
// glitched the sec write operation.
217-
ASSERT_DEATH(
218-
[] {
216+
EXPECT_DEATH(
217+
{
219218
EXPECT_ABS_WRITE32(0, 0x12345678);
220219
EXPECT_ABS_READ32(0, 0x12345678);
221220
sec_mmio_write32(0, 0x12345678);
222221
sec_mmio_check_counters(/*expected_check_count=*/0);
223-
}(),
222+
},
224223
"");
225224
}
226225

sw/device/silicon_creator/lib/drivers/lifecycle_unittest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class LifecycleDeathTest : public LifecycleTest,
124124
public testing::WithParamInterface<uint32_t> {};
125125

126126
TEST_P(LifecycleDeathTest, InvalidState) {
127-
ASSERT_DEATH(
127+
EXPECT_DEATH(
128128
{
129129
EXPECT_SEC_READ32(base_ + LC_CTRL_LC_STATE_REG_OFFSET, GetParam());
130130
lifecycle_state_get();

sw/device/silicon_creator/lib/shutdown_unittest.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -560,7 +560,7 @@ TEST_F(ShutdownTest, InitializeManufacturing) {
560560
class ShutdownDeathTest : public ShutdownTest {};
561561

562562
TEST_F(ShutdownDeathTest, InitializeInvalid) {
563-
ASSERT_DEATH(
563+
EXPECT_DEATH(
564564
{
565565
SetupOtpReads();
566566
shutdown_init(static_cast<lifecycle_state_t>(0));

sw/device/silicon_creator/lib/sigverify_unittest.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -170,7 +170,7 @@ INSTANTIATE_TEST_SUITE_P(NonTestOperationalStates, SigverifyInNonTestStates,
170170
class SigverifyInNonTestStatesDeathTest : public SigverifyInLcState {};
171171

172172
TEST_P(SigverifyInNonTestStatesDeathTest, BadOtpValue) {
173-
ASSERT_DEATH(
173+
EXPECT_DEATH(
174174
{
175175
EXPECT_CALL(
176176
otp_,
@@ -222,7 +222,7 @@ TEST_F(SigverifyInTestStates, BadSignatureIbex) {
222222
class SigverifyBadLcStateDeathTest : public SigverifyInLcState {};
223223

224224
TEST_F(SigverifyBadLcStateDeathTest, BadLcState) {
225-
ASSERT_DEATH(
225+
EXPECT_DEATH(
226226
{
227227
uint32_t flash_exec = 0;
228228
sigverify_rsa_verify(&kSignature, &key_, &kTestDigest,

sw/device/silicon_creator/mask_rom/sigverify_keys_unittest.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ TEST_P(BadKeyIdTypeDeathTest, BadKeyType) {
180180
};
181181
const sigverify_rsa_key_t *key;
182182

183-
ASSERT_DEATH(
183+
EXPECT_DEATH(
184184
{
185185
ExpectKeysPtrGet(keys);
186186
sigverify_rsa_key_get(key_id, GetParam(), &key);
@@ -206,7 +206,7 @@ TEST_P(NonOperationalStateDeathTest, BadKey) {
206206
std::tie(key_index, lc_state) = GetParam();
207207
const sigverify_rsa_key_t *key;
208208

209-
ASSERT_DEATH(
209+
EXPECT_DEATH(
210210
{
211211
ExpectKeysPtrGet(kMockKeys);
212212
sigverify_rsa_key_get(

0 commit comments

Comments
 (0)