Skip to content

Commit d711775

Browse files
AngheloAlfAngheloAlf
committed
fmt tests
1 parent c99fdc2 commit d711775

File tree

4 files changed

+90
-23
lines changed

4 files changed

+90
-23
lines changed

‎objdiff-core/tests/arch_arm.rs‎

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ mod common;
66
#[cfg(feature = "arm")]
77
fn read_arm() {
88
let diff_config = diff::DiffObjConfig { ..Default::default() };
9-
let obj = obj::read::parse(include_object!("data/arm/LinkStateItem.o"), &diff_config, obj::DiffSide::Base).unwrap();
9+
let obj = obj::read::parse(
10+
include_object!("data/arm/LinkStateItem.o"),
11+
&diff_config,
12+
obj::DiffSide::Base,
13+
)
14+
.unwrap();
1015
insta::assert_debug_snapshot!(obj);
1116
let symbol_idx =
1217
obj.symbols.iter().position(|s| s.name == "_ZN13LinkStateItem12OnStateLeaveEi").unwrap();
@@ -20,7 +25,9 @@ fn read_arm() {
2025
#[cfg(feature = "arm")]
2126
fn read_thumb() {
2227
let diff_config = diff::DiffObjConfig { ..Default::default() };
23-
let obj = obj::read::parse(include_object!("data/arm/thumb.o"), &diff_config, obj::DiffSide::Base).unwrap();
28+
let obj =
29+
obj::read::parse(include_object!("data/arm/thumb.o"), &diff_config, obj::DiffSide::Base)
30+
.unwrap();
2431
insta::assert_debug_snapshot!(obj);
2532
let symbol_idx = obj
2633
.symbols
@@ -37,7 +44,9 @@ fn read_thumb() {
3744
#[cfg(feature = "arm")]
3845
fn combine_text_sections() {
3946
let diff_config = diff::DiffObjConfig { combine_text_sections: true, ..Default::default() };
40-
let obj = obj::read::parse(include_object!("data/arm/enemy300.o"), &diff_config, obj::DiffSide::Base).unwrap();
47+
let obj =
48+
obj::read::parse(include_object!("data/arm/enemy300.o"), &diff_config, obj::DiffSide::Base)
49+
.unwrap();
4150
let symbol_idx = obj.symbols.iter().position(|s| s.name == "Enemy300Draw").unwrap();
4251
let diff = diff::code::no_diff_code(&obj, symbol_idx, &diff_config).unwrap();
4352
insta::assert_debug_snapshot!(diff.instruction_rows);

‎objdiff-core/tests/arch_mips.rs‎

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@ mod common;
66
#[cfg(feature = "mips")]
77
fn read_mips() {
88
let diff_config = diff::DiffObjConfig { mips_register_prefix: true, ..Default::default() };
9-
let obj = obj::read::parse(include_object!("data/mips/main.c.o"), &diff_config, obj::DiffSide::Base).unwrap();
9+
let obj =
10+
obj::read::parse(include_object!("data/mips/main.c.o"), &diff_config, obj::DiffSide::Base)
11+
.unwrap();
1012
insta::assert_debug_snapshot!(obj);
1113
let symbol_idx = obj.symbols.iter().position(|s| s.name == "ControlEntry").unwrap();
1214
let diff = diff::code::no_diff_code(&obj, symbol_idx, &diff_config).unwrap();
@@ -19,9 +21,13 @@ fn read_mips() {
1921
#[cfg(feature = "mips")]
2022
fn cross_endian_diff() {
2123
let diff_config = diff::DiffObjConfig::default();
22-
let obj_be = obj::read::parse(include_object!("data/mips/code_be.o"), &diff_config, obj::DiffSide::Base).unwrap();
24+
let obj_be =
25+
obj::read::parse(include_object!("data/mips/code_be.o"), &diff_config, obj::DiffSide::Base)
26+
.unwrap();
2327
assert_eq!(obj_be.endianness, object::Endianness::Big);
24-
let obj_le = obj::read::parse(include_object!("data/mips/code_le.o"), &diff_config, obj::DiffSide::Base).unwrap();
28+
let obj_le =
29+
obj::read::parse(include_object!("data/mips/code_le.o"), &diff_config, obj::DiffSide::Base)
30+
.unwrap();
2531
assert_eq!(obj_le.endianness, object::Endianness::Little);
2632
let left_symbol_idx = obj_be.symbols.iter().position(|s| s.name == "func_00000000").unwrap();
2733
let right_symbol_idx =
@@ -42,6 +48,11 @@ fn cross_endian_diff() {
4248
#[cfg(feature = "mips")]
4349
fn filter_non_matching() {
4450
let diff_config = diff::DiffObjConfig::default();
45-
let obj = obj::read::parse(include_object!("data/mips/vw_main.c.o"), &diff_config, obj::DiffSide::Base).unwrap();
51+
let obj = obj::read::parse(
52+
include_object!("data/mips/vw_main.c.o"),
53+
&diff_config,
54+
obj::DiffSide::Base,
55+
)
56+
.unwrap();
4657
insta::assert_debug_snapshot!(obj.symbols);
4758
}

‎objdiff-core/tests/arch_ppc.rs‎

Lines changed: 30 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@ mod common;
1010
#[cfg(feature = "ppc")]
1111
fn read_ppc() {
1212
let diff_config = diff::DiffObjConfig::default();
13-
let obj = obj::read::parse(include_object!("data/ppc/IObj.o"), &diff_config, obj::DiffSide::Base).unwrap();
13+
let obj =
14+
obj::read::parse(include_object!("data/ppc/IObj.o"), &diff_config, obj::DiffSide::Base)
15+
.unwrap();
1416
insta::assert_debug_snapshot!(obj);
1517
let symbol_idx =
1618
obj.symbols.iter().position(|s| s.name == "Type2Text__10SObjectTagFUi").unwrap();
@@ -24,7 +26,12 @@ fn read_ppc() {
2426
#[cfg(feature = "ppc")]
2527
fn read_dwarf1_line_info() {
2628
let diff_config = diff::DiffObjConfig::default();
27-
let obj = obj::read::parse(include_object!("data/ppc/m_Do_hostIO.o"), &diff_config, obj::DiffSide::Base).unwrap();
29+
let obj = obj::read::parse(
30+
include_object!("data/ppc/m_Do_hostIO.o"),
31+
&diff_config,
32+
obj::DiffSide::Base,
33+
)
34+
.unwrap();
2835
let line_infos = obj
2936
.sections
3037
.iter()
@@ -38,7 +45,12 @@ fn read_dwarf1_line_info() {
3845
#[cfg(feature = "ppc")]
3946
fn read_extab() {
4047
let diff_config = diff::DiffObjConfig::default();
41-
let obj = obj::read::parse(include_object!("data/ppc/NMWException.o"), &diff_config, obj::DiffSide::Base).unwrap();
48+
let obj = obj::read::parse(
49+
include_object!("data/ppc/NMWException.o"),
50+
&diff_config,
51+
obj::DiffSide::Base,
52+
)
53+
.unwrap();
4254
insta::assert_debug_snapshot!(obj);
4355
}
4456

@@ -47,12 +59,18 @@ fn read_extab() {
4759
fn diff_ppc() {
4860
let diff_config = diff::DiffObjConfig::default();
4961
let mapping_config = diff::MappingConfig::default();
50-
let target_obj =
51-
obj::read::parse(include_object!("data/ppc/CDamageVulnerability_target.o"), &diff_config, obj::DiffSide::Target)
52-
.unwrap();
53-
let base_obj =
54-
obj::read::parse(include_object!("data/ppc/CDamageVulnerability_base.o"), &diff_config, obj::DiffSide::Base)
55-
.unwrap();
62+
let target_obj = obj::read::parse(
63+
include_object!("data/ppc/CDamageVulnerability_target.o"),
64+
&diff_config,
65+
obj::DiffSide::Target,
66+
)
67+
.unwrap();
68+
let base_obj = obj::read::parse(
69+
include_object!("data/ppc/CDamageVulnerability_base.o"),
70+
&diff_config,
71+
obj::DiffSide::Base,
72+
)
73+
.unwrap();
5674
let diff =
5775
diff::diff_objs(Some(&target_obj), Some(&base_obj), None, &diff_config, &mapping_config)
5876
.unwrap();
@@ -90,7 +108,9 @@ fn diff_ppc() {
90108
#[cfg(feature = "ppc")]
91109
fn read_vmx128_coff() {
92110
let diff_config = diff::DiffObjConfig { combine_data_sections: true, ..Default::default() };
93-
let obj = obj::read::parse(include_object!("data/ppc/vmx128.obj"), &diff_config, obj::DiffSide::Base).unwrap();
111+
let obj =
112+
obj::read::parse(include_object!("data/ppc/vmx128.obj"), &diff_config, obj::DiffSide::Base)
113+
.unwrap();
94114
insta::assert_debug_snapshot!(obj);
95115
let symbol_idx =
96116
obj.symbols.iter().position(|s| s.name == "?FloatingPointExample@@YAXXZ").unwrap();

‎objdiff-core/tests/arch_x86.rs‎

Lines changed: 33 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,12 @@ mod common;
66
#[cfg(feature = "x86")]
77
fn read_x86() {
88
let diff_config = diff::DiffObjConfig::default();
9-
let obj = obj::read::parse(include_object!("data/x86/staticdebug.obj"), &diff_config, obj::DiffSide::Base).unwrap();
9+
let obj = obj::read::parse(
10+
include_object!("data/x86/staticdebug.obj"),
11+
&diff_config,
12+
obj::DiffSide::Base,
13+
)
14+
.unwrap();
1015
insta::assert_debug_snapshot!(obj);
1116
let symbol_idx = obj.symbols.iter().position(|s| s.name == "?PrintThing@@YAXXZ").unwrap();
1217
let diff = diff::code::no_diff_code(&obj, symbol_idx, &diff_config).unwrap();
@@ -23,15 +28,22 @@ fn read_x86_combine_sections() {
2328
combine_text_sections: true,
2429
..Default::default()
2530
};
26-
let obj = obj::read::parse(include_object!("data/x86/rtest.obj"), &diff_config, obj::DiffSide::Base).unwrap();
31+
let obj =
32+
obj::read::parse(include_object!("data/x86/rtest.obj"), &diff_config, obj::DiffSide::Base)
33+
.unwrap();
2734
insta::assert_debug_snapshot!(obj.sections);
2835
}
2936

3037
#[test]
3138
#[cfg(feature = "x86")]
3239
fn read_x86_64() {
3340
let diff_config = diff::DiffObjConfig::default();
34-
let obj = obj::read::parse(include_object!("data/x86_64/vs2022.o"), &diff_config, obj::DiffSide::Base).unwrap();
41+
let obj = obj::read::parse(
42+
include_object!("data/x86_64/vs2022.o"),
43+
&diff_config,
44+
obj::DiffSide::Base,
45+
)
46+
.unwrap();
3547
insta::assert_debug_snapshot!(obj);
3648
let symbol_idx =
3749
obj.symbols.iter().position(|s| s.name == "?Dot@Vector@@QEAAMPEAU1@@Z").unwrap();
@@ -45,7 +57,12 @@ fn read_x86_64() {
4557
#[cfg(feature = "x86")]
4658
fn display_section_ordering() {
4759
let diff_config = diff::DiffObjConfig::default();
48-
let obj = obj::read::parse(include_object!("data/x86/basenode.obj"), &diff_config, obj::DiffSide::Base).unwrap();
60+
let obj = obj::read::parse(
61+
include_object!("data/x86/basenode.obj"),
62+
&diff_config,
63+
obj::DiffSide::Base,
64+
)
65+
.unwrap();
4966
let obj_diff =
5067
diff::diff_objs(Some(&obj), None, None, &diff_config, &diff::MappingConfig::default())
5168
.unwrap()
@@ -60,7 +77,12 @@ fn display_section_ordering() {
6077
#[cfg(feature = "x86")]
6178
fn read_x86_jumptable() {
6279
let diff_config = diff::DiffObjConfig::default();
63-
let obj = obj::read::parse(include_object!("data/x86/jumptable.o"), &diff_config, obj::DiffSide::Base).unwrap();
80+
let obj = obj::read::parse(
81+
include_object!("data/x86/jumptable.o"),
82+
&diff_config,
83+
obj::DiffSide::Base,
84+
)
85+
.unwrap();
6486
insta::assert_debug_snapshot!(obj);
6587
let symbol_idx = obj.symbols.iter().position(|s| s.name == "?test@@YAHH@Z").unwrap();
6688
let diff = diff::code::no_diff_code(&obj, symbol_idx, &diff_config).unwrap();
@@ -74,6 +96,11 @@ fn read_x86_jumptable() {
7496
#[cfg(feature = "x86")]
7597
fn read_x86_local_labels() {
7698
let diff_config = diff::DiffObjConfig::default();
77-
let obj = obj::read::parse(include_object!("data/x86/local_labels.obj"), &diff_config, obj::DiffSide::Base).unwrap();
99+
let obj = obj::read::parse(
100+
include_object!("data/x86/local_labels.obj"),
101+
&diff_config,
102+
obj::DiffSide::Base,
103+
)
104+
.unwrap();
78105
insta::assert_debug_snapshot!(obj);
79106
}

0 commit comments

Comments
 (0)