Add missing cfg for test

pull/112/head
Andre Richter 3 years ago
parent b4e3ebc606
commit d6e4a03189
No known key found for this signature in database
GPG Key ID: 2116C1AB102F615E

@ -1098,7 +1098,7 @@ diff -uNr 11_exceptions_part1_groundwork/src/_arch/aarch64/memory/mmu.rs 12_inte
diff -uNr 11_exceptions_part1_groundwork/src/bsp/raspberrypi/console.rs 12_integrated_testing/src/bsp/raspberrypi/console.rs diff -uNr 11_exceptions_part1_groundwork/src/bsp/raspberrypi/console.rs 12_integrated_testing/src/bsp/raspberrypi/console.rs
--- 11_exceptions_part1_groundwork/src/bsp/raspberrypi/console.rs --- 11_exceptions_part1_groundwork/src/bsp/raspberrypi/console.rs
+++ 12_integrated_testing/src/bsp/raspberrypi/console.rs +++ 12_integrated_testing/src/bsp/raspberrypi/console.rs
@@ -35,3 +35,13 @@ @@ -35,3 +35,14 @@
pub fn console() -> &'static impl console::interface::All { pub fn console() -> &'static impl console::interface::All {
&super::PL011_UART &super::PL011_UART
} }
@ -1111,6 +1111,7 @@ diff -uNr 11_exceptions_part1_groundwork/src/bsp/raspberrypi/console.rs 12_integ
+/// than on real hardware due to QEMU's abstractions. +/// than on real hardware due to QEMU's abstractions.
+/// +///
+/// For the RPi, nothing needs to be done. +/// For the RPi, nothing needs to be done.
+#[cfg(feature = "test_build")]
+pub fn qemu_bring_up_console() {} +pub fn qemu_bring_up_console() {}
diff -uNr 11_exceptions_part1_groundwork/src/bsp/raspberrypi/memory/mmu.rs 12_integrated_testing/src/bsp/raspberrypi/memory/mmu.rs diff -uNr 11_exceptions_part1_groundwork/src/bsp/raspberrypi/memory/mmu.rs 12_integrated_testing/src/bsp/raspberrypi/memory/mmu.rs

@ -44,4 +44,5 @@ pub fn console() -> &'static impl console::interface::All {
/// than on real hardware due to QEMU's abstractions. /// than on real hardware due to QEMU's abstractions.
/// ///
/// For the RPi, nothing needs to be done. /// For the RPi, nothing needs to be done.
#[cfg(feature = "test_build")]
pub fn qemu_bring_up_console() {} pub fn qemu_bring_up_console() {}

@ -44,4 +44,5 @@ pub fn console() -> &'static impl console::interface::All {
/// than on real hardware due to QEMU's abstractions. /// than on real hardware due to QEMU's abstractions.
/// ///
/// For the RPi, nothing needs to be done. /// For the RPi, nothing needs to be done.
#[cfg(feature = "test_build")]
pub fn qemu_bring_up_console() {} pub fn qemu_bring_up_console() {}

@ -58,4 +58,5 @@ pub fn console() -> &'static impl console::interface::All {
/// than on real hardware due to QEMU's abstractions. /// than on real hardware due to QEMU's abstractions.
/// ///
/// For the RPi, nothing needs to be done. /// For the RPi, nothing needs to be done.
#[cfg(feature = "test_build")]
pub fn qemu_bring_up_console() {} pub fn qemu_bring_up_console() {}

@ -1024,14 +1024,14 @@ diff -uNr 14_virtual_mem_part2_mmio_remap/src/bsp/raspberrypi/console.rs 15_virt
/// Return a reference to the console. /// Return a reference to the console.
pub fn console() -> &'static impl console::interface::All { pub fn console() -> &'static impl console::interface::All {
&super::PL011_UART &super::PL011_UART
@@ -56,6 +74,15 @@ @@ -56,7 +74,15 @@
/// Minimal code needed to bring up the console in QEMU (for testing only). This is often less steps /// Minimal code needed to bring up the console in QEMU (for testing only). This is often less steps
/// than on real hardware due to QEMU's abstractions. /// than on real hardware due to QEMU's abstractions.
-/// -///
-/// For the RPi, nothing needs to be done. -/// For the RPi, nothing needs to be done.
#[cfg(feature = "test_build")]
-pub fn qemu_bring_up_console() {} -pub fn qemu_bring_up_console() {}
+#[cfg(feature = "test_build")]
+pub fn qemu_bring_up_console() { +pub fn qemu_bring_up_console() {
+ use driver::interface::DeviceDriver; + use driver::interface::DeviceDriver;
+ +

Loading…
Cancel
Save