X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=regressions%2Frhbz557655.sh;h=df3ceaa0267a4604b8790e65c795c194be3e43cf;hb=54e91da925323642e67b8ce4b95899fe4b7a51c4;hp=85cfb1e8847472afa0ee046002191b4da61037e5;hpb=2a224424acc47dc0f50fe605463bf2936fceb27c;p=libguestfs.git

diff --git a/regressions/rhbz557655.sh b/regressions/rhbz557655.sh
index 85cfb1e..df3ceaa 100755
--- a/regressions/rhbz557655.sh
+++ b/regressions/rhbz557655.sh
@@ -14,7 +14,7 @@
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
-# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 # Regression test for:
 # https://bugzilla.redhat.com/show_bug.cgi?id=557655
@@ -45,17 +45,10 @@ get-memsize
 -set-memsize 07777770000000000000
 -set-memsize ABC
 -set-memsize 09
--set-memsize 123K
 -set-memsize 123L
 EOF
 
-../fish/guestfish >> test.out 2>> test.err <<EOF
-alloc test1.img 10M
-run
-part-disk /dev/sda mbr
-mkfs ext2 /dev/sda1
-mount /dev/sda1 /
-
+../fish/guestfish -N fs -m /dev/sda1 >> test.out 2>> test.err <<EOF
 touch /test
 
 # truncate-size takes an Int64 argument
@@ -75,7 +68,6 @@ filesize /test
 # these should all provoke parse errors:
 -truncate-size /test ABC
 -truncate-size /test 09
--truncate-size /test 123K
 -truncate-size /test 123L
 EOF
 
@@ -85,9 +77,10 @@ EOF
 # number of truncate_size.
 mv test.err test.err~
 grep -E 'set[-_]memsize|truncate[-_]size' test.err~ |
+  grep -Ev 'libguestfs: trace:' |
   grep -Ev 'proc 200' > test.err
 rm test.err~
 
-diff -u test.out rhbz557655-expected.stdout
-diff -u test.err rhbz557655-expected.stderr
+diff -u rhbz557655-expected.stdout test.out
+diff -u rhbz557655-expected.stderr test.err
 rm test.out test.err test1.img