meta-security/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch

   1 diff --git a/tests/Makefile.in b/tests/Makefile.in
   2 index 60cf655..ce220f1 100644
   3 --- a/tests/Makefile.in
   4 +++ b/tests/Makefile.in
   5 @@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
   6         @echo "#!/bin/sh" > test_one
   7         @echo "HTREE=y" >> test_one
   8         @echo "QUOTA=y" >> test_one
   9 -       @echo "SRCDIR=@srcdir@" >> test_one
  10 +       @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_one
  11         @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one
  12         @cat $(srcdir)/test_one.in >> test_one
  13         @chmod +x test_one
  14 @@ -26,7 +26,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
  15  test_script: test_one test_script.in Makefile mke2fs.conf
  16         @echo "Creating test_script..."
  17         @echo "#!/bin/sh" > test_script
  18 -       @echo "SRCDIR=@srcdir@" >> test_script
  19 +       @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_script
  20         @cat $(srcdir)/test_script.in >> test_script
  21         @chmod +x test_script
  22
  23 diff --git a/tests/test_config b/tests/test_config
  24 index 7f39157..c815a44 100644
  25 --- a/tests/test_config
  26 +++ b/tests/test_config
  27 @@ -3,24 +3,24 @@
  28  #
  29
  30  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
  31 -FSCK="$USE_VALGRIND ../e2fsck/e2fsck"
  32 -MKE2FS="$USE_VALGRIND ../misc/mke2fs"
  33 -DUMPE2FS="$USE_VALGRIND ../misc/dumpe2fs"
  34 -TUNE2FS="$USE_VALGRIND ../misc/tune2fs"
  35 -CHATTR="$USE_VALGRIND../misc/chattr"
  36 -LSATTR="$USE_VALGRIND ../misc/lsattr"
  37 -E2IMAGE="$USE_VALGRIND ../misc/e2image"
  38 -E2IMAGE_EXE="../misc/e2image"
  39 -DEBUGFS="$USE_VALGRIND ../debugfs/debugfs"
  40 -DEBUGFS_EXE="../debugfs/debugfs"
  41 -TEST_BITS="../debugfs/debugfs"
  42 -RESIZE2FS_EXE="../resize/resize2fs"
  43 +FSCK="$USE_VALGRIND e2fsck"
  44 +MKE2FS="$USE_VALGRIND mke2fs"
  45 +DUMPE2FS="$USE_VALGRIND dumpe2fs"
  46 +TUNE2FS="$USE_VALGRIND tune2fs"
  47 +CHATTR="$USE_VALGRIND chattr"
  48 +LSATTR="$USE_VALGRIND lsattr"
  49 +E2IMAGE="$USE_VALGRIND e2image"
  50 +E2IMAGE_EXE="/sbin/e2image"
  51 +DEBUGFS="$USE_VALGRIND debugfs"
  52 +DEBUGFS_EXE="/sbin/debugfs"
  53 +TEST_BITS="/sbin/debugfs"
  54 +RESIZE2FS_EXE="/sbin/resize2fs"
  55  RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE"
  56 -E2UNDO_EXE="../misc/e2undo"
  57 +E2UNDO_EXE="/sbin/e2undo"
  58  E2UNDO="$USE_VALGRIND $E2UNDO_EXE"
  59 -TEST_REL=../tests/progs/test_rel
  60 -TEST_ICOUNT=../tests/progs/test_icount
  61 -CRCSUM=../tests/progs/crcsum
  62 +TEST_REL=./progs/test_rel
  63 +TEST_ICOUNT=./progs/test_icount
  64 +CRCSUM=./progs/crcsum
  65  CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed"
  66  LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH}
  67  DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH}