diff options
| author |   Yi Zhao <yi.zhao@windriver.com> | 2017-08-25 10:11:20 +0800 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2017-08-25 13:33:40 +0100 |
| commit | 82d244a9225bd1fa512e696aae917febe051fcf9 (patch) | |
| tree | 60d18a5e170ecfe0f96a74d8c6a1884c2a2aa734 /meta/recipes-devtools/e2fsprogs/e2fsprogs | |
| parent | afa9f769d62034d4443dfe929422d1d591adf709 (diff) | |
| download | openembedded-core-82d244a9225bd1fa512e696aae917febe051fcf9.tar.gz | |
e2fsprogs: fix ptest script
* Fix hardcoded path for ptest script which would cause failure on
mulitilib:
ls: cannot access '/usr/lib/e2fsprogs/ptest/test/[a-zA-Z]_*': No such file or directory
./test_script: line 54: /usr/lib/e2fsprogs/ptest/test/test_post: No such file or directory
* Add missing '$' for shell variable reference
Signed-off-by: Yi Zhao <yi.zhao@windriver.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools/e2fsprogs/e2fsprogs')
| -rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch | 25 | ||||
| -rw-r--r-- | meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest | 2 |
2 files changed, 20 insertions, 7 deletions
diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch index cc32dbf66b..7df0967637 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch @@ -1,7 +1,7 @@ Upstream-Status: Inappropriate diff --git a/tests/Makefile.in b/tests/Makefile.in -index 60cf655..ce220f1 100644 +index c130f4a..d2ade03 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf @@ -9,21 +9,21 @@ index 60cf655..ce220f1 100644 @echo "HTREE=y" >> test_one @echo "QUOTA=y" >> test_one - @echo "SRCDIR=@srcdir@" >> test_one -+ @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_one ++ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one + @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one @cat $(srcdir)/test_one.in >> test_one - @chmod +x test_one -@@ -26,7 +26,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf +@@ -27,7 +27,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf 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 ++ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_script @cat $(srcdir)/test_script.in >> test_script @chmod +x test_script diff --git a/tests/test_config b/tests/test_config -index 7f39157..c815a44 100644 +index 547ef4c..e11e6f4 100644 --- a/tests/test_config +++ b/tests/test_config @@ -3,24 +3,24 @@ @@ -67,3 +67,16 @@ index 7f39157..c815a44 100644 CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} +diff --git a/tests/test_script.in b/tests/test_script.in +index 9959e30..442999d 100644 +--- a/tests/test_script.in ++++ b/tests/test_script.in +@@ -39,7 +39,7 @@ for i; do + done + + if test "$TESTS"x = x ; then +- if test -n "DO_FAILED"; then ++ if test -n "$DO_FAILED"; then + exit 0 + fi + TESTS=`ls -d $SRCDIR/[a-zA-Z]_*` diff --git a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest index 1ac2513248..e02fc7f2b9 100644 --- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest +++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest @@ -5,7 +5,7 @@ cd ./test if [ $? -eq 0 ] then echo "PASS: e2fsprogs" - rm test.log + rm ../test.log else echo "FAIL: e2fsprogs" fi |