summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorYi Zhao <yi.zhao@windriver.com>2017-08-25 10:11:20 +0800
committerRichard Purdie <richard.purdie@linuxfoundation.org>2017-08-27 22:30:06 +0100
commit17ac2b6103a551b0e20ae991887a94295332de20 (patch)
tree4d78634a92f3b002fda817a0e3573154094380e1
parent51cc0b07a14277c71a3b6184575fe30ab489c717 (diff)
downloadpoky-17ac2b6103a551b0e20ae991887a94295332de20.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 (From OE-Core rev: 82d244a9225bd1fa512e696aae917febe051fcf9) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch25
-rw-r--r--meta/recipes-devtools/e2fsprogs/e2fsprogs/run-ptest2
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 @@
1Upstream-Status: Inappropriate 1Upstream-Status: Inappropriate
2 2
3diff --git a/tests/Makefile.in b/tests/Makefile.in 3diff --git a/tests/Makefile.in b/tests/Makefile.in
4index 60cf655..ce220f1 100644 4index c130f4a..d2ade03 100644
5--- a/tests/Makefile.in 5--- a/tests/Makefile.in
6+++ b/tests/Makefile.in 6+++ b/tests/Makefile.in
7@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf 7@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
@@ -9,21 +9,21 @@ index 60cf655..ce220f1 100644
9 @echo "HTREE=y" >> test_one 9 @echo "HTREE=y" >> test_one
10 @echo "QUOTA=y" >> test_one 10 @echo "QUOTA=y" >> test_one
11- @echo "SRCDIR=@srcdir@" >> test_one 11- @echo "SRCDIR=@srcdir@" >> test_one
12+ @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_one 12+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one
13 @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one 13 @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one
14 @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one
14 @cat $(srcdir)/test_one.in >> test_one 15 @cat $(srcdir)/test_one.in >> test_one
15 @chmod +x test_one 16@@ -27,7 +27,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
16@@ -26,7 +26,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
17 test_script: test_one test_script.in Makefile mke2fs.conf 17 test_script: test_one test_script.in Makefile mke2fs.conf
18 @echo "Creating test_script..." 18 @echo "Creating test_script..."
19 @echo "#!/bin/sh" > test_script 19 @echo "#!/bin/sh" > test_script
20- @echo "SRCDIR=@srcdir@" >> test_script 20- @echo "SRCDIR=@srcdir@" >> test_script
21+ @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_script 21+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_script
22 @cat $(srcdir)/test_script.in >> test_script 22 @cat $(srcdir)/test_script.in >> test_script
23 @chmod +x test_script 23 @chmod +x test_script
24 24
25diff --git a/tests/test_config b/tests/test_config 25diff --git a/tests/test_config b/tests/test_config
26index 7f39157..c815a44 100644 26index 547ef4c..e11e6f4 100644
27--- a/tests/test_config 27--- a/tests/test_config
28+++ b/tests/test_config 28+++ b/tests/test_config
29@@ -3,24 +3,24 @@ 29@@ -3,24 +3,24 @@
@@ -67,3 +67,16 @@ index 7f39157..c815a44 100644
67 CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" 67 CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed"
68 LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH} 68 LD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${LD_LIBRARY_PATH}
69 DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH} 69 DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH}
70diff --git a/tests/test_script.in b/tests/test_script.in
71index 9959e30..442999d 100644
72--- a/tests/test_script.in
73+++ b/tests/test_script.in
74@@ -39,7 +39,7 @@ for i; do
75 done
76
77 if test "$TESTS"x = x ; then
78- if test -n "DO_FAILED"; then
79+ if test -n "$DO_FAILED"; then
80 exit 0
81 fi
82 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
5if [ $? -eq 0 ] 5if [ $? -eq 0 ]
6then 6then
7 echo "PASS: e2fsprogs" 7 echo "PASS: e2fsprogs"
8 rm test.log 8 rm ../test.log
9else 9else
10 echo "FAIL: e2fsprogs" 10 echo "FAIL: e2fsprogs"
11fi 11fi