From a7a4b85ff89481322a8eb7f588579a73bcb6fbbd Mon Sep 17 00:00:00 2001 From: "Richard W.M. Jones" Date: Tue, 30 Oct 2012 14:25:16 +0000 Subject: [PATCH] Skip all btrfs tests. Remove hairy Makefile editing. --- libguestfs.spec | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/libguestfs.spec b/libguestfs.spec index 8ef10fb..4b86318 100644 --- a/libguestfs.spec +++ b/libguestfs.spec @@ -765,8 +765,9 @@ export SKIP_TEST_BTRFS_FILESYSTEM_SYNC=1 export SKIP_TEST_BTRFS_SUBVOLUME_DELETE=1 export SKIP_TEST_BTRFS_SUBVOLUME_SNAPSHOT=1 export SKIP_TEST_MKFS_BTRFS=1 -perl -i.bak -e 'while (<>) {print unless /tests\/btrfs/}' Makefile.am -perl -i.bak -e 'while (<>) {print unless /tests\/charset/}' Makefile.am +export SKIP_TEST_BTRFS_DEVICES_SH=1 +export SKIP_TEST_BTRFS_SUBVOLUME_DEFAULT_PL=1 +export SKIP_TEST_CHARSET_FIDELITY=1 %if %{runtests} %ifnarch %{ix86} # RHBZ#870042