summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEric Sandeen <sandeen@redhat.com>2013-05-09 01:46:43 -0500
committerEric Sandeen <sandeen@redhat.com>2013-05-09 01:46:43 -0500
commit802a0e42f15a62b222dd83ff5f8495f04ed8e4c1 (patch)
treeff85f44a55ac4bd7ef83ad5cd011687c9065a41d
parent536c55b2c9eb8a6422b2931eaa7368a4ceaa44f3 (diff)
downloade2fsprogs-802a0e42f15a62b222dd83ff5f8495f04ed8e4c1.tar.gz
e2fsprogs-802a0e42f15a62b222dd83ff5f8495f04ed8e4c1.tar.xz
e2fsprogs-802a0e42f15a62b222dd83ff5f8495f04ed8e4c1.zip
Fix regression test in new version
-rw-r--r--e2fsprogs-1.42.8-f_extent_oobounds.patch25
-rw-r--r--e2fsprogs.spec3
2 files changed, 28 insertions, 0 deletions
diff --git a/e2fsprogs-1.42.8-f_extent_oobounds.patch b/e2fsprogs-1.42.8-f_extent_oobounds.patch
new file mode 100644
index 0000000..dc9b1e5
--- /dev/null
+++ b/e2fsprogs-1.42.8-f_extent_oobounds.patch
@@ -0,0 +1,25 @@
+[PATCH] e2fsprogs: fix tests/f_extent_oobounds
+
+tests/f_extent_oobounds runs debugfs from the system, not
+from the source tree, and if the system's debugfs doesn't
+have the extent_open command it fails silently.
+
+Use $DEBUGFS to get the right executable.
+
+Signed-off-by: Eric Sandeen <sandeen@redhat.com>
+---
+
+diff --git a/tests/f_extent_oobounds/script b/tests/f_extent_oobounds/script
+index 31ac6c9..b1f0e1a 100644
+--- a/tests/f_extent_oobounds/script
++++ b/tests/f_extent_oobounds/script
+@@ -5,7 +5,7 @@ TEST_DATA="$test_name.tmp"
+
+ dd if=/dev/zero of=$TMPFILE bs=1k count=256 > /dev/null 2>&1
+ mke2fs -Ft ext4 $TMPFILE > /dev/null 2>&1
+-debugfs -w $TMPFILE << EOF > /dev/null 2>&1
++$DEBUGFS -w $TMPFILE << EOF > /dev/null 2>&1
+ write /dev/null testfile
+ extent_open testfile
+ insert_node 0 15 100
+
diff --git a/e2fsprogs.spec b/e2fsprogs.spec
index 4e8b307..614283d 100644
--- a/e2fsprogs.spec
+++ b/e2fsprogs.spec
@@ -11,6 +11,7 @@ Source1: ext2_types-wrapper.h
Source2: e2fsck.conf
Patch1: e2fsprogs-1.40.4-sb_feature_check_ignore.patch
+Patch2: e2fsprogs-1.42.8-f_extent_oobounds.patch
Url: http://e2fsprogs.sourceforge.net/
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
@@ -150,6 +151,8 @@ It was originally inspired by the Multics SubSystem library.
# mildly unsafe but 'til I get something better, avoid full fsck
# after an selinux install...
%patch1 -p1 -b .featurecheck
+# Fix a regression test
+%patch2 -p1
%build
%configure --enable-elf-shlibs --enable-nls --disable-uuidd --disable-fsck \