Skip to content

Commit 6787bb7

Browse files
committed
Make sure we panic/abort for fork test
1 parent 5ff1953 commit 6787bb7

File tree

1 file changed

+5
-16
lines changed

1 file changed

+5
-16
lines changed

bin_tests/tests/crashtracker_bin_test.rs

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -365,7 +365,7 @@ fn test_crash_tracking_bin_panic_hook_after_fork() {
365365

366366
// Set up custom artifacts: receiver + crashtracker_bin_test
367367
let crashtracker_receiver = create_crashtracker_receiver(BuildProfile::Release);
368-
let crashtracker_bin_test = create_crashtracker_bin_test(BuildProfile::Debug);
368+
let crashtracker_bin_test = create_crashtracker_bin_test(BuildProfile::Debug, true);
369369

370370
let artifacts_map = build_artifacts(&[&crashtracker_receiver, &crashtracker_bin_test]).unwrap();
371371

@@ -1267,20 +1267,8 @@ fn setup_test_fixtures<'a>(crates: &[&'a ArtifactsBuild]) -> TestFixtures<'a> {
12671267
fn setup_crashtracking_crates(
12681268
crash_tracking_receiver_profile: BuildProfile,
12691269
) -> (ArtifactsBuild, ArtifactsBuild) {
1270-
let crashtracker_bin = ArtifactsBuild {
1271-
name: "crashtracker_bin_test".to_owned(),
1272-
build_profile: crash_tracking_receiver_profile,
1273-
artifact_type: ArtifactType::Bin,
1274-
triple_target: None,
1275-
..Default::default()
1276-
};
1277-
let crashtracker_receiver = ArtifactsBuild {
1278-
name: "test_crashtracker_receiver".to_owned(),
1279-
build_profile: crash_tracking_receiver_profile,
1280-
artifact_type: ArtifactType::Bin,
1281-
triple_target: None,
1282-
..Default::default()
1283-
};
1270+
let crashtracker_bin = create_crashtracker_bin_test(crash_tracking_receiver_profile, false);
1271+
let crashtracker_receiver = create_crashtracker_receiver(crash_tracking_receiver_profile);
12841272
(crashtracker_bin, crashtracker_receiver)
12851273
}
12861274

@@ -1307,12 +1295,13 @@ fn create_crashing_app(profile: BuildProfile, panic_abort: bool) -> ArtifactsBui
13071295
}
13081296
}
13091297

1310-
fn create_crashtracker_bin_test(profile: BuildProfile) -> ArtifactsBuild {
1298+
fn create_crashtracker_bin_test(profile: BuildProfile, panic_abort: bool) -> ArtifactsBuild {
13111299
ArtifactsBuild {
13121300
name: "crashtracker_bin_test".to_owned(),
13131301
build_profile: profile,
13141302
artifact_type: ArtifactType::Bin,
13151303
triple_target: None,
1304+
panic_abort: if panic_abort { Some(true) } else { None },
13161305
..Default::default()
13171306
}
13181307
}

0 commit comments

Comments
 (0)