Changeset 36637 in vbox for trunk/src/VBox/Storage

Timestamp:

Apr 9, 2011 12:17:40 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

71101

Message:

tstVDIo: Bugfix and extend compact testcase to VHD

Location:

trunk/src/VBox/Storage/testcase

Files:

• tstVDCompact.vd (modified) (1 diff)
• tstVDIo.cpp (modified) (1 diff)

trunk/src/VBox/Storage/testcase/tstVDCompact.vd

@@ -22 +22 @@
 iopatterncreatefromnumber name=zero size=1M pattern=0
 
+print msg=Testing_VDI
 # Create disk containers, read verification is on.
 createdisk name=disk verify=yes
-
-# Create the disk and close it.
+# Create the disk.
 create disk=disk mode=base name=tstCompact.vdi type=dynamic backend=VDI size=200M
-
 # Fill the disk with random data
-io disk=disk async=no max-reqs=32 mode=seq blocksize=64k off=0-200M size=200M writes=100
-
+io disk=disk async=no mode=seq blocksize=64k off=0-200M size=200M writes=100
 # Read the data to verify it once.
-io disk=disk async=no max-reqs=32 mode=seq blocksize=64k off=0-200M size=200M writes=0
-
+io disk=disk async=no mode=seq blocksize=64k off=0-200M size=200M writes=0
 # Fill a part with 0's
-io disk=disk async=no max-reqs=32 mode=seq blocksize=64k off=100M-150M size=50M writes=100 pattern=zero
-
+io disk=disk async=no mode=seq blocksize=64k off=100M-150M size=50M writes=100 pattern=zero
 # Now compact
 compact disk=disk image=0
-
 # Read again to verify that the content hasn't changed
-io disk=disk async=no max-reqs=32 mode=seq blocksize=64k off=0-200M size=200M writes=0
-
+io disk=disk async=no mode=seq blocksize=64k off=0-200M size=200M writes=0
+# Fill everything with 0
+io disk=disk async=no mode=seq blocksize=64k off=0M-200M size=200M writes=100 pattern=zero
+# Now compact
+compact disk=disk image=0
+# Read again to verify that the content hasn't changed
+io disk=disk async=no mode=seq blocksize=64k off=0-200M size=200M writes=0
 # Cleanup
 close disk=disk mode=single delete=yes
 destroydisk name=disk
+
+print msg=Testing_VHD
+# Create disk containers, read verification is on.
+createdisk name=disk verify=yes
+# Create the disk.
+create disk=disk mode=base name=tstCompact.vhd type=dynamic backend=VHD size=200M
+# Fill the disk with random data
+io disk=disk async=no mode=seq blocksize=64k off=0-200M size=200M writes=100
+# Read the data to verify it once.
+io disk=disk async=no mode=seq blocksize=64k off=0-200M size=200M writes=0
+# Fill a part with 0's
+io disk=disk async=no mode=seq blocksize=64k off=100M-150M size=50M writes=100 pattern=zero
+# Now compact
+compact disk=disk image=0
+# Read again to verify that the content hasn't changed
+io disk=disk async=no mode=seq blocksize=64k off=0-200M size=200M writes=0
+# Fill everything with 0
+io disk=disk async=no mode=seq blocksize=64k off=0M-200M size=200M writes=100 pattern=zero
+# Now compact
+compact disk=disk image=0
+# Read again to verify that the content hasn't changed
+io disk=disk async=no mode=seq blocksize=64k off=0-200M size=200M writes=0
+# Cleanup
+close disk=disk mode=single delete=yes
+destroydisk name=disk
+
+# Destroy RNG and pattern
 iopatterndestroy name=zero
 iorngdestroy

trunk/src/VBox/Storage/testcase/tstVDIo.cpp

@@ -1361 +1361 @@
                 *((uint64_t*)pv)     = u64Pattern;
                 pPattern->cbPattern -= sizeof(uint64_t);
-                pv                   = (uint64_t *)pv + sizeof(uint64_t);
+                pv                   = (uint64_t *)pv + 1;
             }
             pPattern->cbPattern = cbPattern; /* Set to the desired size. (could be unaligned) */