[PATCH v2] kvm-unit-test: fix script output abnormal

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



./run_tests.sh
)ASS apic-split (50 tests;
)ASS ioapic-split (19 tests;
)ASS apic (50 tests;
)ASS ioapic (19 tests;
)ASS smptest (1 tests;
)ASS smptest3 (1 tests;

The problem come from commit 0f4f2acb2c880607518cb740a6aa06acafd05855
(x86: io: force carriage return on \n put to serial port). It maybe output
well in real hardware, but it let outputs to file with '\r'.

Changes v1 --> v2:
	changes in scripts/runtime.bash can affect other arch.

Signed-off-by: Peng Hao <peng.hao2@xxxxxxxxxx>
---
 lib/x86/io.c | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/x86/io.c b/lib/x86/io.c
index edac5bc..3be55d7 100644
--- a/lib/x86/io.c
+++ b/lib/x86/io.c
@@ -6,6 +6,7 @@
 #ifndef USE_SERIAL
 #define USE_SERIAL
 #endif
+#undef USE_SERIAL_HARDWARE_OUTPUT
 
 static struct spinlock lock;
 static int serial_iobase = 0x3f8;
@@ -24,9 +25,11 @@ static void serial_outb(char ch)
 
 static void serial_put(char ch)
 {
+#ifdef USE_SERIAL_HARDWARE_OUTPUT
         /* Force carriage return to be performed on \n */
         if (ch == '\n')
                 serial_outb('\r');
+#endif
         serial_outb(ch);
 }
 
-- 
1.8.3.1




[Index of Archives]     [KVM ARM]     [KVM ia64]     [KVM ppc]     [Virtualization Tools]     [Spice Development]     [Libvirt]     [Libvirt Users]     [Linux USB Devel]     [Linux Audio Users]     [Yosemite Questions]     [Linux Kernel]     [Linux SCSI]     [XFree86]

  Powered by Linux