e2fsprogs: add ptest

Enable ptest for e2fsprogs by reusing provided testsuite.

(From OE-Core rev: 47edd33cf8df3ebbfd5164136fb79ac831f01286)

Signed-off-by: Dmitry Eremin-Solenikov <dmitry_eremin@mentor.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
Dmitry Eremin-Solenikov
2015-04-18 17:58:17 +03:00
committed by Richard Purdie
parent 8fb1cd85d0
commit 869a770ba4
3 changed files with 94 additions and 0 deletions

View File

@@ -0,0 +1,66 @@
Index: e2fsprogs-1.42.9/tests/Makefile.in
===================================================================
--- e2fsprogs-1.42.9.orig/tests/Makefile.in
+++ e2fsprogs-1.42.9/tests/Makefile.in
@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile
@echo "#!/bin/sh" > test_one
@HTREE_CMT@ @echo "HTREE=y" >> test_one
@QUOTA_CMT@ @echo "QUOTA=y" >> test_one
- @echo "SRCDIR=@srcdir@" >> test_one
+ @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_one
@echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one
@cat $(srcdir)/test_one.in >> test_one
@chmod +x test_one
@@ -26,7 +26,7 @@ test_one: $(srcdir)/test_one.in Makefile
test_script: test_one test_script.in Makefile mke2fs.conf
@echo "Creating test_script..."
@echo "#!/bin/sh" > test_script
- @echo "SRCDIR=@srcdir@" >> test_script
+ @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_script
@cat $(srcdir)/test_script.in >> test_script
@chmod +x test_script
Index: e2fsprogs-1.42.9/tests/test_config
===================================================================
--- e2fsprogs-1.42.9.orig/tests/test_config
+++ e2fsprogs-1.42.9/tests/test_config
@@ -3,23 +3,23 @@
#
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
-FSCK="$USE_VALGRIND ../e2fsck/e2fsck"
-MKE2FS="$USE_VALGRIND ../misc/mke2fs"
-DUMPE2FS="$USE_VALGRIND ../misc/dumpe2fs"
-TUNE2FS="$USE_VALGRIND ../misc/tune2fs"
-CHATTR="$USE_VALGRIND../misc/chattr"
-LSATTR="$USE_VALGRIND ../misc/lsattr"
-E2IMAGE="$USE_VALGRIND ../misc/e2image"
-E2IMAGE_EXE="../misc/e2image"
-DEBUGFS="$USE_VALGRIND ../debugfs/debugfs"
-DEBUGFS_EXE="../debugfs/debugfs"
-TEST_BITS="../debugfs/debugfs"
-RESIZE2FS_EXE="../resize/resize2fs"
+FSCK="$USE_VALGRIND e2fsck"
+MKE2FS="$USE_VALGRIND mke2fs"
+DUMPE2FS="$USE_VALGRIND dumpe2fs"
+TUNE2FS="$USE_VALGRIND tune2fs"
+CHATTR="$USE_VALGRIND chattr"
+LSATTR="$USE_VALGRIND lsattr"
+E2IMAGE="$USE_VALGRIND e2image"
+E2IMAGE_EXE="/sbin/e2image"
+DEBUGFS="$USE_VALGRIND debugfs"
+DEBUGFS_EXE="/sbin/debugfs"
+TEST_BITS="/sbin/debugfs"
+RESIZE2FS_EXE="/sbin/resize2fs"
RESIZE2FS="$USE_VALGRIND $RESIZE2FS_EXE"
-E2UNDO_EXE="../misc/e2undo"
-TEST_REL=../tests/progs/test_rel
-TEST_ICOUNT=../tests/progs/test_icount
-CRCSUM=../tests/progs/crcsum
+E2UNDO_EXE="/sbin/e2undo"
+TEST_REL=./progs/test_rel
+TEST_ICOUNT=./progs/test_icount
+CRCSUM=./progs/crcsum
LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss
DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss
export LD_LIBRARY_PATH

View File

@@ -0,0 +1,11 @@
#!/bin/sh
cd ./test
./test_script &>../test.log
if [ $? -eq 0 ]
then
echo "PASS: e2fsprogs"
rm test.log
else
echo "FAIL: e2fsprogs"
fi

View File

@@ -87,3 +87,20 @@ ALTERNATIVE_${PN} = "chattr"
ALTERNATIVE_PRIORITY = "100"
ALTERNATIVE_LINK_NAME[chattr] = "${base_bindir}/chattr"
ALTERNATIVE_TARGET[chattr] = "${base_bindir}/chattr.e2fsprogs"
inherit ptest
SRC_URI += "file://run-ptest"
SRC_URI += "file://ptest.patch"
RDEPENDS_${PN}-ptest += "${PN} ${PN}-tune2fs coreutils procps"
#RDEPENDS_${PN}-ptest += "expect"
do_compile_ptest() {
oe_runmake -C ${B}/tests
}
do_install_ptest() {
cp -a ${B}/tests ${D}${PTEST_PATH}/test
cp -a ${S}/tests/* ${D}${PTEST_PATH}/test
sed -e 's!../e2fsck/e2fsck!e2fsck!g' -i ${D}${PTEST_PATH}/test/*/expect*
}