search for: filesanddirs

...uot; / btrfs-device-add "/dev/sdb1" / btrfs-device-delete "/dev/sdc1 /dev/sdd1" / +btrfs-replace-start "/dev/sda1" "/dev/sdd1" / force:true +btrfs-replace-start "/dev/sdd1" "/dev/sda1" / force:true mkdir /data2 tar-in $srcdir/../data/filesanddirs-10M.tar.xz /data2 compress:xz @@ -74,6 +76,8 @@ btrfs-device-add "/dev/sdc1 /dev/sdd1" / btrfs-device-delete "/dev/sdb1" / btrfs-device-add "/dev/sdb1" / btrfs-device-delete "/dev/sdc1 /dev/sdd1" / +btrfs-replace-start "/dev/sda1" "/dev/sdd1...

...dev/sdd1" / >>>> +btrfs-replace-start "/dev/sda1" "/dev/sdd1" / force:true >>>> +btrfs-replace-start "/dev/sdd1" "/dev/sda1" / force:true >>>> >>>> mkdir /data2 >>>> tar-in $srcdir/../data/filesanddirs-10M.tar.xz /data2 compress:xz >>>> @@ -74,6 +76,8 @@ btrfs-device-add "/dev/sdc1 /dev/sdd1" / >>>> btrfs-device-delete "/dev/sdb1" / >>>> btrfs-device-add "/dev/sdb1" / >>>> btrfs-device-delete "/dev/sdc1 /d...

...t; btrfs-device-delete "/dev/sdc1 /dev/sdd1" / >> +btrfs-replace-start "/dev/sda1" "/dev/sdd1" / force:true >> +btrfs-replace-start "/dev/sdd1" "/dev/sda1" / force:true >> >> mkdir /data2 >> tar-in $srcdir/../data/filesanddirs-10M.tar.xz /data2 compress:xz >> @@ -74,6 +76,8 @@ btrfs-device-add "/dev/sdc1 /dev/sdd1" / >> btrfs-device-delete "/dev/sdb1" / >> btrfs-device-add "/dev/sdb1" / >> btrfs-device-delete "/dev/sdc1 /dev/sdd1" / >> +btrfs-rep...

...uot; + exit 77 +fi + +rm -f test-btrfs-devices-{1,2}.img replace.output + +guestfish <<EOF > replace.output +# Add 2 empty disks +sparse test-btrfs-devices-1.img 1G +sparse test-btrfs-devices-2.img 1G +run + +mkfs-btrfs /dev/sda +mount /dev/sda / + +mkdir /data +copy-in $srcdir/../data/filesanddirs-10M.tar.xz /data + +# now, sda is btrfs while sdb is blank. +btrfs-replace /dev/sda /dev/sdb / + +# after replace: sda is wiped out, while sdb has btrfs with data +list-filesystems +ls /data/ + +EOF + +if [ "$(cat replace.output)" != "/dev/sda: unknown +/dev/sdb: btrfs +filesanddirs-...

...;/dev/sdb1" / > btrfs-device-delete "/dev/sdc1 /dev/sdd1" / > +btrfs-replace-start "/dev/sda1" "/dev/sdd1" / force:true > +btrfs-replace-start "/dev/sdd1" "/dev/sda1" / force:true > > mkdir /data2 > tar-in $srcdir/../data/filesanddirs-10M.tar.xz /data2 compress:xz > @@ -74,6 +76,8 @@ btrfs-device-add "/dev/sdc1 /dev/sdd1" / > btrfs-device-delete "/dev/sdb1" / > btrfs-device-add "/dev/sdb1" / > btrfs-device-delete "/dev/sdc1 /dev/sdd1" / > +btrfs-replace-start "/dev/s...

...;>>> +btrfs-replace-start "/dev/sda1" "/dev/sdd1" / force:true > >>>> +btrfs-replace-start "/dev/sdd1" "/dev/sda1" / force:true > >>>> > >>>> mkdir /data2 > >>>> tar-in $srcdir/../data/filesanddirs-10M.tar.xz /data2 compress:xz > >>>> @@ -74,6 +76,8 @@ btrfs-device-add "/dev/sdc1 /dev/sdd1" / > >>>> btrfs-device-delete "/dev/sdb1" / > >>>> btrfs-device-add "/dev/sdb1" / > >>>> btrfs-device-delet...

..."/dev/sdc1 /dev/sdd1" / > >> +btrfs-replace-start "/dev/sda1" "/dev/sdd1" / force:true > >> +btrfs-replace-start "/dev/sdd1" "/dev/sda1" / force:true > >> > >> mkdir /data2 > >> tar-in $srcdir/../data/filesanddirs-10M.tar.xz /data2 compress:xz > >> @@ -74,6 +76,8 @@ btrfs-device-add "/dev/sdc1 /dev/sdd1" / > >> btrfs-device-delete "/dev/sdb1" / > >> btrfs-device-add "/dev/sdb1" / > >> btrfs-device-delete "/dev/sdc1 /dev/sdd1" /...

...uot; + exit 77 +fi + +rm -f test-btrfs-devices-{1,2}.img replace.output + +guestfish <<EOF > replace.output +# Add 2 empty disks +sparse test-btrfs-devices-1.img 1G +sparse test-btrfs-devices-2.img 1G +run + +mkfs-btrfs /dev/sda +mount /dev/sda / + +mkdir /data +copy-in $srcdir/../data/filesanddirs-10M.tar.xz /data + +# now, sda is btrfs while sdb is blank. +btrfs-replace /dev/sda /dev/sdb / + +# after replace: sda is wiped out, while sdb has btrfs with data +list-filesystems +ls /data/ + +EOF + +if [ "$(cat replace.output)" != "/dev/sda: unknown +/dev/sdb: btrfs +filesanddirs-...

https://bugzilla.redhat.com/show_bug.cgi?id=847880 https://bugzilla.redhat.com/show_bug.cgi?id=847881 This patch series adds various optional arguments to the tar-in and tar-out commands. Firstly (1/7) an optional "compress" flag is added to select compression. This makes the calls tgz-in/tgz-out/txz-in/txz-out deprecated, and expands the range of compression types available.

...uot; + exit 77 +fi + +rm -f test-btrfs-devices-{1,2}.img replace.output + +guestfish <<EOF > replace.output +# Add 2 empty disks +sparse test-btrfs-devices-1.img 1G +sparse test-btrfs-devices-2.img 1G +run + +mkfs-btrfs /dev/sda +mount /dev/sda / + +mkdir /data +copy-in $srcdir/../data/filesanddirs-10M.tar.xz /data + +# now, sda is btrfs while sdb is blank. +btrfs-replace /dev/sda /dev/sdb / + +# after replace: sda is wiped out, while sdb has btrfs with data +list-filesystems + +EOF + +if [ "$(cat replace.output)" != "/dev/sda: unknown +/dev/sdb: btrfs" ]; then + echo &...

...lt;<EOF > replace.output >> +# Add 2 empty disks >> +sparse test-btrfs-devices-1.img 1G >> +sparse test-btrfs-devices-2.img 1G >> +run >> + >> +mkfs-btrfs /dev/sda >> +mount /dev/sda / >> + >> +mkdir /data >> +copy-in $srcdir/../data/filesanddirs-10M.tar.xz /data >> + >> +# now, sda is btrfs while sdb is blank. >> +btrfs-replace /dev/sda /dev/sdb / >> + >> +# after replace: sda is wiped out, while sdb has btrfs with data >> +list-filesystems > > Should at this point the content of sdb be checked, to...

...t; erlang/tests/010-load.erl > guestfs-release-notes.txt > html/draft.png > logo/fish.png > po/libguestfs.pot > tests/data/bin-i586-dynamic > tests/data/bin-sparc-dynamic > tests/data/bin-win32.exe > tests/data/bin-win64.exe > tests/data/bin-x86_64-dynamic > tests/data/filesanddirs-100M.tar.xz > tests/data/filesanddirs-10M.tar.xz > tests/data/helloworld.tar > tests/data/helloworld.tar.gz > tests/data/helloworld.tar.xz > tests/data/known-4 > tests/data/known-5 > tests/data/lib-i586.so > tests/data/lib-sparc.so > tests/data/lib-win32.dll > tests/da...

...ssible[$i], "\n" } -print "\n"; diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index d00400d..5c15892 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -19,52 +19,55 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ README-binfiles \ - filesanddirs-10M.tar.xz \ - filesanddirs-100M.tar.xz \ - helloworld.tar \ - helloworld.tar.gz \ - helloworld.tar.xz \ - mbr-ext2-empty.img.gz \ - empty known-1 known-2 known-3 known-4 known-5 \ bin-aarch64-dynamic \ bin-i586-dynamic \ bin-sparc-dynamic \ bin-win32.exe \ bin-win64.exe \ bin-x86_64-dy...

...ad1 COPYRIGHT + +Copyright (C) 2014-2015 Red Hat Inc. diff --git a/tests/data/Makefile.am b/tests/data/Makefile.am index 305136f..d379826 100644 --- a/tests/data/Makefile.am +++ b/tests/data/Makefile.am @@ -19,13 +19,6 @@ include $(top_srcdir)/subdir-rules.mk EXTRA_DIST = \ README-binfiles \ - filesanddirs-10M.tar.xz \ - filesanddirs-100M.tar.xz \ - helloworld.tar \ - helloworld.tar.gz \ - helloworld.tar.xz \ - mbr-ext2-empty.img.gz \ - empty known-1 known-2 known-3 known-4 known-5 \ bin-aarch64-dynamic \ bin-armv7-dynamic \ bin-i586-dynamic \ @@ -37,6 +30,13 @@ EXTRA_DIST = \ bin-win32.exe \...

...replace.output > + > +guestfish <<EOF > replace.output > +# Add 2 empty disks > +sparse test-btrfs-devices-1.img 1G > +sparse test-btrfs-devices-2.img 1G > +run > + > +mkfs-btrfs /dev/sda > +mount /dev/sda / > + > +mkdir /data > +copy-in $srcdir/../data/filesanddirs-10M.tar.xz /data > + > +# now, sda is btrfs while sdb is blank. > +btrfs-replace /dev/sda /dev/sdb / > + > +# after replace: sda is wiped out, while sdb has btrfs with data > +list-filesystems Should at this point the content of sdb be checked, to see whether the data previously...

...gt; +# Add 2 empty disks >>> +sparse test-btrfs-devices-1.img 1G >>> +sparse test-btrfs-devices-2.img 1G >>> +run >>> + >>> +mkfs-btrfs /dev/sda >>> +mount /dev/sda / >>> + >>> +mkdir /data >>> +copy-in $srcdir/../data/filesanddirs-10M.tar.xz /data >>> + >>> +# now, sda is btrfs while sdb is blank. >>> +btrfs-replace /dev/sda /dev/sdb / >>> + >>> +# after replace: sda is wiped out, while sdb has btrfs with data >>> +list-filesystems >> >> Should at this point t...

...;> +sparse test-btrfs-devices-1.img 1G >>>> +sparse test-btrfs-devices-2.img 1G >>>> +run >>>> + >>>> +mkfs-btrfs /dev/sda >>>> +mount /dev/sda / >>>> + >>>> +mkdir /data >>>> +copy-in $srcdir/../data/filesanddirs-10M.tar.xz /data >>>> + >>>> +# now, sda is btrfs while sdb is blank. >>>> +btrfs-replace /dev/sda /dev/sdb / >>>> + >>>> +# after replace: sda is wiped out, while sdb has btrfs with data >>>> +list-filesystems >>> &gt...

Previously I posted a work-in-progress preview of this patch series: https://www.redhat.com/archives/libguestfs/2017-February/msg00224.html This is the finished version that updates all of the shell-script based tests. It passes 'make check', 'make check-direct' and 'make check-slow'. Rich.

This converts more of the tests (basically everything under tests/) to use the test harness, revealing some problems which have subsequently been fixed. Rich.

--- test-data/phony-guests/Makefile.am | 3 +-- test-data/phony-guests/make-archlinux-img.sh | 4 ++-- test-data/phony-guests/make-coreos-img.sh | 10 ++++---- test-data/phony-guests/make-debian-img.sh | 10 ++++---- test-data/phony-guests/make-fedora-img.pl | 34 ++++++++++++++-------------- test-data/phony-guests/make-ubuntu-img.sh | 14 ++++++------