Skip to content

Commit a4e67f3

Browse files
committed
Remove fragile framebuffer checks
1 parent 302b8ae commit a4e67f3

File tree

4 files changed

+0
-60
lines changed

4 files changed

+0
-60
lines changed

tests/test_kernels/default_settings/src/bin/check_boot_info.rs

-15
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,12 @@ fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
1414
// check framebuffer
1515
let framebuffer = boot_info.framebuffer.as_ref().unwrap();
1616
assert_eq!(framebuffer.info().byte_len, framebuffer.buffer().len());
17-
if ![640, 1024].contains(&framebuffer.info().horizontal_resolution) {
18-
panic!(
19-
"unexpected horizontal_resolution `{}`",
20-
framebuffer.info().horizontal_resolution
21-
);
22-
}
23-
if ![480, 768].contains(&framebuffer.info().vertical_resolution) {
24-
panic!(
25-
"unexpected vertical_resolution `{}`",
26-
framebuffer.info().vertical_resolution
27-
);
28-
}
2917
if ![3, 4].contains(&framebuffer.info().bytes_per_pixel) {
3018
panic!(
3119
"unexpected bytes_per_pixel `{}`",
3220
framebuffer.info().bytes_per_pixel
3321
);
3422
}
35-
if ![640, 1024].contains(&framebuffer.info().stride) {
36-
panic!("unexpected stride `{}`", framebuffer.info().stride);
37-
}
3823
assert_eq!(framebuffer.info().pixel_format, PixelFormat::Bgr);
3924
assert_eq!(
4025
framebuffer.buffer().len(),

tests/test_kernels/higher_half/src/bin/check_boot_info.rs

-15
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,12 @@ fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
1414
// check framebuffer
1515
let framebuffer = boot_info.framebuffer.as_ref().unwrap();
1616
assert_eq!(framebuffer.info().byte_len, framebuffer.buffer().len());
17-
if ![640, 1024].contains(&framebuffer.info().horizontal_resolution) {
18-
panic!(
19-
"unexpected horizontal_resolution `{}`",
20-
framebuffer.info().horizontal_resolution
21-
);
22-
}
23-
if ![480, 768].contains(&framebuffer.info().vertical_resolution) {
24-
panic!(
25-
"unexpected vertical_resolution `{}`",
26-
framebuffer.info().vertical_resolution
27-
);
28-
}
2917
if ![3, 4].contains(&framebuffer.info().bytes_per_pixel) {
3018
panic!(
3119
"unexpected bytes_per_pixel `{}`",
3220
framebuffer.info().bytes_per_pixel
3321
);
3422
}
35-
if ![640, 1024].contains(&framebuffer.info().stride) {
36-
panic!("unexpected stride `{}`", framebuffer.info().stride);
37-
}
3823
assert_eq!(framebuffer.info().pixel_format, PixelFormat::Bgr);
3924
assert_eq!(
4025
framebuffer.buffer().len(),

tests/test_kernels/map_phys_mem/src/bin/check_boot_info.rs

-15
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,12 @@ fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
1414
// check framebuffer
1515
let framebuffer = boot_info.framebuffer.as_ref().unwrap();
1616
assert_eq!(framebuffer.info().byte_len, framebuffer.buffer().len());
17-
if ![640, 1024].contains(&framebuffer.info().horizontal_resolution) {
18-
panic!(
19-
"unexpected horizontal_resolution `{}`",
20-
framebuffer.info().horizontal_resolution
21-
);
22-
}
23-
if ![480, 768].contains(&framebuffer.info().vertical_resolution) {
24-
panic!(
25-
"unexpected vertical_resolution `{}`",
26-
framebuffer.info().vertical_resolution
27-
);
28-
}
2917
if ![3, 4].contains(&framebuffer.info().bytes_per_pixel) {
3018
panic!(
3119
"unexpected bytes_per_pixel `{}`",
3220
framebuffer.info().bytes_per_pixel
3321
);
3422
}
35-
if ![640, 1024].contains(&framebuffer.info().stride) {
36-
panic!("unexpected stride `{}`", framebuffer.info().stride);
37-
}
3823
assert_eq!(framebuffer.info().pixel_format, PixelFormat::Bgr);
3924
assert_eq!(
4025
framebuffer.buffer().len(),

tests/test_kernels/pie/src/bin/check_boot_info.rs

-15
Original file line numberDiff line numberDiff line change
@@ -14,27 +14,12 @@ fn kernel_main(boot_info: &'static mut BootInfo) -> ! {
1414
// check framebuffer
1515
let framebuffer = boot_info.framebuffer.as_ref().unwrap();
1616
assert_eq!(framebuffer.info().byte_len, framebuffer.buffer().len());
17-
if ![640, 1024].contains(&framebuffer.info().horizontal_resolution) {
18-
panic!(
19-
"unexpected horizontal_resolution `{}`",
20-
framebuffer.info().horizontal_resolution
21-
);
22-
}
23-
if ![480, 768].contains(&framebuffer.info().vertical_resolution) {
24-
panic!(
25-
"unexpected vertical_resolution `{}`",
26-
framebuffer.info().vertical_resolution
27-
);
28-
}
2917
if ![3, 4].contains(&framebuffer.info().bytes_per_pixel) {
3018
panic!(
3119
"unexpected bytes_per_pixel `{}`",
3220
framebuffer.info().bytes_per_pixel
3321
);
3422
}
35-
if ![640, 1024].contains(&framebuffer.info().stride) {
36-
panic!("unexpected stride `{}`", framebuffer.info().stride);
37-
}
3823
assert_eq!(framebuffer.info().pixel_format, PixelFormat::Bgr);
3924
assert_eq!(
4025
framebuffer.buffer().len(),

0 commit comments

Comments
 (0)