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