diff options
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch')
-rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch | 33 |
1 files changed, 8 insertions, 25 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch index 4e6b6292e1..c3e46ce65f 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch | |||
@@ -5,11 +5,13 @@ Subject: [PATCH] e2fsprogs: add ptest | |||
5 | 5 | ||
6 | Upstream-Status: Inappropriate | 6 | Upstream-Status: Inappropriate |
7 | 7 | ||
8 | Rebase for e2fsprogs 1.45.3. | ||
9 | |||
10 | Signed-off-by: Kai Kang <kai.kang@windriver.com> | ||
8 | --- | 11 | --- |
9 | tests/Makefile.in | 4 ++-- | 12 | tests/Makefile.in | 4 ++-- |
10 | tests/test_config | 32 ++++++++++++++++---------------- | 13 | tests/test_config | 32 ++++++++++++++++---------------- |
11 | tests/test_script.in | 2 +- | 14 | 2 files changed, 18 insertions(+), 18 deletions(-) |
12 | 3 files changed, 19 insertions(+), 19 deletions(-) | ||
13 | 15 | ||
14 | diff --git a/tests/Makefile.in b/tests/Makefile.in | 16 | diff --git a/tests/Makefile.in b/tests/Makefile.in |
15 | index 8c4d2048..e021af32 100644 | 17 | index 8c4d2048..e021af32 100644 |
@@ -34,10 +36,10 @@ index 8c4d2048..e021af32 100644 | |||
34 | @chmod +x-w test_script | 36 | @chmod +x-w test_script |
35 | 37 | ||
36 | diff --git a/tests/test_config b/tests/test_config | 38 | diff --git a/tests/test_config b/tests/test_config |
37 | index 1f146ca2..05125f9c 100644 | 39 | index 9dc762ce..a5fbdef6 100644 |
38 | --- a/tests/test_config | 40 | --- a/tests/test_config |
39 | +++ b/tests/test_config | 41 | +++ b/tests/test_config |
40 | @@ -3,16 +3,16 @@ | 42 | @@ -3,25 +3,25 @@ |
41 | # | 43 | # |
42 | 44 | ||
43 | unset LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME PAGER | 45 | unset LANG LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_CTYPE LC_IDENTIFICATION LC_MEASUREMENT LC_MESSAGES LC_MONETARY LC_NAME LC_NUMERIC LC_PAPER LC_TELEPHONE LC_TIME PAGER |
@@ -62,12 +64,6 @@ index 1f146ca2..05125f9c 100644 | |||
62 | +DEBUGFS="$USE_VALGRIND debugfs" | 64 | +DEBUGFS="$USE_VALGRIND debugfs" |
63 | +DEBUGFS_EXE="/sbin/debugfs" | 65 | +DEBUGFS_EXE="/sbin/debugfs" |
64 | TEST_BITS="test_data.tmp" | 66 | TEST_BITS="test_data.tmp" |
65 | if [ ! -s $TEST_BITS ]; then | ||
66 | # create a non-sparse test file if possible, since debugfs may be | ||
67 | @@ -21,14 +21,14 @@ if [ ! -s $TEST_BITS ]; then | ||
68 | dd if=/dev/urandom of=$TEST_BITS bs=128k count=1 > /dev/null 2>&1 || | ||
69 | TEST_BITS="$DEFBUGFS_EXE" | ||
70 | fi | ||
71 | -RESIZE2FS_EXE="../resize/resize2fs" | 67 | -RESIZE2FS_EXE="../resize/resize2fs" |
72 | +RESIZE2FS_EXE="/sbin/resize2fs" | 68 | +RESIZE2FS_EXE="/sbin/resize2fs" |
73 | RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE" | 69 | RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE" |
@@ -85,16 +81,3 @@ index 1f146ca2..05125f9c 100644 | |||
85 | CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" | 81 | CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" |
86 | LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} | 82 | LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} |
87 | DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} | 83 | DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} |
88 | diff --git a/tests/test_script.in b/tests/test_script.in | ||
89 | index 9959e308..442999db 100644 | ||
90 | --- a/tests/test_script.in | ||
91 | +++ b/tests/test_script.in | ||
92 | @@ -39,7 +39,7 @@ for i; do | ||
93 | done | ||
94 | |||
95 | if test "$TESTS"x = x ; then | ||
96 | - if test -n "DO_FAILED"; then | ||
97 | + if test -n "$DO_FAILED"; then | ||
98 | exit 0 | ||
99 | fi | ||
100 | TESTS=`ls -d $SRCDIR/[a-zA-Z]_*` | ||