Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From b8842065ad621a03a971dfd50db862c5bffdeb49 Mon Sep 17 00:00:00 2001 |
| 2 | From: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com> |
| 3 | Date: Sat, 18 Apr 2015 17:58:17 +0300 |
| 4 | Subject: [PATCH] e2fsprogs: add ptest |
| 5 | |
Brad Bishop | d7bf8c1 | 2018-02-25 22:55:05 -0500 | [diff] [blame] | 6 | Upstream-Status: Inappropriate |
| 7 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 8 | --- |
| 9 | tests/Makefile.in | 4 ++-- |
| 10 | tests/test_config | 32 ++++++++++++++++---------------- |
| 11 | tests/test_script.in | 2 +- |
| 12 | 3 files changed, 19 insertions(+), 19 deletions(-) |
| 13 | |
| 14 | diff --git a/tests/Makefile.in b/tests/Makefile.in |
| 15 | index 8c4d2048..e021af32 100644 |
| 16 | --- a/tests/Makefile.in |
| 17 | +++ b/tests/Makefile.in |
| 18 | @@ -19,7 +19,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 19 | @echo "#!/bin/sh" > test_one |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 20 | @echo "HTREE=y" >> test_one |
| 21 | @echo "QUOTA=y" >> test_one |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 22 | - @echo "SRCDIR=@srcdir@" >> test_one |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 23 | + @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 24 | @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 25 | @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one |
Brad Bishop | 316dfdd | 2018-06-25 12:45:53 -0400 | [diff] [blame] | 26 | @echo "DD=@DD@" >>test_one |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 27 | @@ -30,7 +30,7 @@ test_script: test_one test_script.in Makefile mke2fs.conf |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 28 | @echo "Creating test_script..." |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 29 | @[ -f test_script ] && chmod u+w test_script || true |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 30 | @echo "#!/bin/sh" > test_script |
| 31 | - @echo "SRCDIR=@srcdir@" >> test_script |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 32 | + @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_script |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 33 | @cat $(srcdir)/test_script.in >> test_script |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 34 | @chmod +x-w test_script |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 35 | |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 36 | diff --git a/tests/test_config b/tests/test_config |
| 37 | index 1f146ca2..05125f9c 100644 |
| 38 | --- a/tests/test_config |
| 39 | +++ b/tests/test_config |
| 40 | @@ -3,16 +3,16 @@ |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 41 | # |
| 42 | |
| 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 |
| 44 | -FSCK="$USE_VALGRIND ../e2fsck/e2fsck" |
| 45 | -MKE2FS="$USE_VALGRIND ../misc/mke2fs" |
| 46 | -DUMPE2FS="$USE_VALGRIND ../misc/dumpe2fs" |
| 47 | -TUNE2FS="$USE_VALGRIND ../misc/tune2fs" |
| 48 | -CHATTR="$USE_VALGRIND../misc/chattr" |
| 49 | -LSATTR="$USE_VALGRIND ../misc/lsattr" |
| 50 | -E2IMAGE="$USE_VALGRIND ../misc/e2image" |
| 51 | -E2IMAGE_EXE="../misc/e2image" |
| 52 | -DEBUGFS="$USE_VALGRIND ../debugfs/debugfs" |
| 53 | -DEBUGFS_EXE="../debugfs/debugfs" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 54 | +FSCK="$USE_VALGRIND e2fsck" |
| 55 | +MKE2FS="$USE_VALGRIND mke2fs" |
| 56 | +DUMPE2FS="$USE_VALGRIND dumpe2fs" |
| 57 | +TUNE2FS="$USE_VALGRIND tune2fs" |
| 58 | +CHATTR="$USE_VALGRIND chattr" |
| 59 | +LSATTR="$USE_VALGRIND lsattr" |
| 60 | +E2IMAGE="$USE_VALGRIND e2image" |
| 61 | +E2IMAGE_EXE="/sbin/e2image" |
| 62 | +DEBUGFS="$USE_VALGRIND debugfs" |
| 63 | +DEBUGFS_EXE="/sbin/debugfs" |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 64 | 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" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 72 | +RESIZE2FS_EXE="/sbin/resize2fs" |
| 73 | RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE" |
| 74 | -E2UNDO_EXE="../misc/e2undo" |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 75 | +E2UNDO_EXE="/sbin/e2undo" |
| 76 | E2UNDO="$USE_VALGRIND $E2UNDO_EXE" |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 77 | -E2MMPSTATUS="$USE_VALGRIND ../misc/dumpe2fs -m" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 78 | -TEST_REL=../tests/progs/test_rel |
| 79 | -TEST_ICOUNT=../tests/progs/test_icount |
| 80 | -CRCSUM=../tests/progs/crcsum |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 81 | +E2MMPSTATUS="$USE_VALGRIND dumpe2fs -m" |
Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 82 | +TEST_REL=./progs/test_rel |
| 83 | +TEST_ICOUNT=./progs/test_icount |
| 84 | +CRCSUM=./progs/crcsum |
Patrick Williams | d8c66bc | 2016-06-20 12:57:21 -0500 | [diff] [blame] | 85 | CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" |
| 86 | 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} |
Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 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 |
Brad Bishop | 6e60e8b | 2018-02-01 10:27:11 -0500 | [diff] [blame] | 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]_*` |