1From b8842065ad621a03a971dfd50db862c5bffdeb49 Mon Sep 17 00:00:00 2001 2From: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com> 3Date: Sat, 18 Apr 2015 17:58:17 +0300 4Subject: [PATCH] e2fsprogs: add ptest 5 6Upstream-Status: Inappropriate 7 8Rebase for e2fsprogs 1.45.3. 9 10Signed-off-by: Kai Kang <kai.kang@windriver.com> 11--- 12 tests/Makefile.in | 4 ++-- 13 tests/test_config | 32 ++++++++++++++++---------------- 14 2 files changed, 18 insertions(+), 18 deletions(-) 15 16diff --git a/tests/Makefile.in b/tests/Makefile.in 17index 8c4d2048..e021af32 100644 18--- a/tests/Makefile.in 19+++ b/tests/Makefile.in 20@@ -19,7 +19,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf 21 @echo "#!/bin/sh" > test_one 22 @echo "HTREE=y" >> test_one 23 @echo "QUOTA=y" >> test_one 24- @echo "SRCDIR=@srcdir@" >> test_one 25+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one 26 @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one 27 @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one 28 @echo "DD=@DD@" >>test_one 29@@ -30,7 +30,7 @@ test_script: test_one test_script.in Makefile mke2fs.conf 30 @echo "Creating test_script..." 31 @[ -f test_script ] && chmod u+w test_script || true 32 @echo "#!/bin/sh" > test_script 33- @echo "SRCDIR=@srcdir@" >> test_script 34+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_script 35 @cat $(srcdir)/test_script.in >> test_script 36 @chmod +x-w test_script 37 38diff --git a/tests/test_config b/tests/test_config 39index 9dc762ce..a5fbdef6 100644 40--- a/tests/test_config 41+++ b/tests/test_config 42@@ -3,25 +3,25 @@ 43 # 44 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 46-FSCK="$USE_VALGRIND ../e2fsck/e2fsck" 47-MKE2FS="$USE_VALGRIND ../misc/mke2fs" 48-DUMPE2FS="$USE_VALGRIND ../misc/dumpe2fs" 49-TUNE2FS="$USE_VALGRIND ../misc/tune2fs" 50-CHATTR="$USE_VALGRIND../misc/chattr" 51-LSATTR="$USE_VALGRIND ../misc/lsattr" 52-E2IMAGE="$USE_VALGRIND ../misc/e2image" 53-E2IMAGE_EXE="../misc/e2image" 54-DEBUGFS="$USE_VALGRIND ../debugfs/debugfs" 55-DEBUGFS_EXE="../debugfs/debugfs" 56+FSCK="$USE_VALGRIND e2fsck" 57+MKE2FS="$USE_VALGRIND mke2fs" 58+DUMPE2FS="$USE_VALGRIND dumpe2fs" 59+TUNE2FS="$USE_VALGRIND tune2fs" 60+CHATTR="$USE_VALGRIND chattr" 61+LSATTR="$USE_VALGRIND lsattr" 62+E2IMAGE="$USE_VALGRIND e2image" 63+E2IMAGE_EXE="/sbin/e2image" 64+DEBUGFS="$USE_VALGRIND debugfs" 65+DEBUGFS_EXE="/sbin/debugfs" 66 TEST_BITS="test_data.tmp" 67-RESIZE2FS_EXE="../resize/resize2fs" 68+RESIZE2FS_EXE="/sbin/resize2fs" 69 RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE" 70-E2UNDO_EXE="../misc/e2undo" 71+E2UNDO_EXE="/sbin/e2undo" 72 E2UNDO="$USE_VALGRIND $E2UNDO_EXE" 73-E2MMPSTATUS="$USE_VALGRIND ../misc/dumpe2fs -m" 74-TEST_REL=../tests/progs/test_rel 75-TEST_ICOUNT=../tests/progs/test_icount 76-CRCSUM=../tests/progs/crcsum 77+E2MMPSTATUS="$USE_VALGRIND dumpe2fs -m" 78+TEST_REL=./progs/test_rel 79+TEST_ICOUNT=./progs/test_icount 80+CRCSUM=./progs/crcsum 81 CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" 82 LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} 83 DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} 84