[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 05/10] qemu-iotests: Remove CR line endings in refere
|
From: |
Kevin Wolf |
|
Subject: |
[Qemu-devel] [PULL 05/10] qemu-iotests: Remove CR line endings in reference output |
|
Date: |
Fri, 4 Apr 2014 21:27:44 +0200 |
qemu doesn't print these CRs any more. The test still didn't fail
because the output comparison ignores line endings, but the change turns
up each time when you want to update the output.
Signed-off-by: Kevin Wolf <address@hidden>
Reviewed-by: Max Reitz <address@hidden>
---
tests/qemu-iotests/051.out | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/tests/qemu-iotests/051.out b/tests/qemu-iotests/051.out
index 671ac5f..a631b0b 100644
--- a/tests/qemu-iotests/051.out
+++ b/tests/qemu-iotests/051.out
@@ -44,11 +44,11 @@ QEMU_PROG: -drive file=TEST_DIR/t.qcow2,driver=foo: could
not open disk image TE
=== Overriding backing file ===
Testing: -drive
file=TEST_DIR/t.qcow2,driver=qcow2,backing.file.filename=TEST_DIR/t.qcow2.orig
-nodefaults
-QEMU X.Y.Z monitor - type 'help' for more information
-(qemu) i[K[Din[K[D[Dinf[K[D[D[Dinfo[K[D[D[D[Dinfo
[K[D[D[D[D[Dinfo b[K[D[D[D[D[D[Dinfo
bl[K[D[D[D[D[D[D[Dinfo blo[K[D[D[D[D[D[D[D[Dinfo
bloc[K[D[D[D[D[D[D[D[D[Dinfo block[K
-ide0-hd0: TEST_DIR/t.qcow2 (qcow2)
- Backing file: TEST_DIR/t.qcow2.orig (chain depth: 1)
-(qemu) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K
+QEMU X.Y.Z monitor - type 'help' for more information
+(qemu) i[K[Din[K[D[Dinf[K[D[D[Dinfo[K[D[D[D[Dinfo
[K[D[D[D[D[Dinfo b[K[D[D[D[D[D[Dinfo
bl[K[D[D[D[D[D[D[Dinfo blo[K[D[D[D[D[D[D[D[Dinfo
bloc[K[D[D[D[D[D[D[D[D[Dinfo block[K
+ide0-hd0: TEST_DIR/t.qcow2 (qcow2)
+ Backing file: TEST_DIR/t.qcow2.orig (chain depth: 1)
+(qemu) q[K[Dqu[K[D[Dqui[K[D[D[Dquit[K
=== Enable and disable lazy refcounting on the command line, plus some invalid
values ===
--
1.8.3.1
- [Qemu-devel] [PULL 00/10] Block patches for 2.0, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 02/10] qcow2: Flush metadata during read-only reopen, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 01/10] iscsi: Don't set error if already set in iscsi_do_inquiry, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 03/10] qcow2: Put cache reference in error case, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 04/10] block: Don't parse 'filename' option, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 06/10] block: Fix snapshot=on for protocol parsed from filename, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 05/10] qemu-iotests: Remove CR line endings in reference output,
Kevin Wolf <=
- [Qemu-devel] [PULL 08/10] dma-helpers: Initialize DMAAIOCB in_cancel flag, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 07/10] block: Check bdrv_getlength() return value in bdrv_append_temp_snapshot(), Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 09/10] iothread: make IOThread struct definition public, Kevin Wolf, 2014/04/04
- [Qemu-devel] [PULL 10/10] dataplane: replace iothread object_add() with embedded instance, Kevin Wolf, 2014/04/04
- Re: [Qemu-devel] [PULL 00/10] Block patches for 2.0, Peter Maydell, 2014/04/05