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-09-11 22:15:58 +0100
commit02b1cc0aefcf7bf093c69f69dc0bb14b7ba634ed (patch)
treeb6c1a93ddfb06e84cc40c4e86cda2424bf7680e7
parente6533d1d9e8c3acd4db3e6cc96ae2afb802ea094 (diff)
downloadpoky-02b1cc0aefcf7bf093c69f69dc0bb14b7ba634ed.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) (From OE-Core rev: d2fc87e074ed41d265667383827c36ceb0302693) Signed-off-by: Yi Zhao <yi.zhao@windriver.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> Signed-off-by: Armin Kuster <akuster808@gmail.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 ef1ce5872a..879d93625e 100644
--- a/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
+++ b/meta/recipes-devtools/e2fsprogs/e2fsprogs/ptest.patch
@@ -1,5 +1,5 @@
1diff --git a/tests/Makefile.in b/tests/Makefile.in 1diff --git a/tests/Makefile.in b/tests/Makefile.in
2index 60cf655..ce220f1 100644 2index c130f4a..d2ade03 100644
3--- a/tests/Makefile.in 3--- a/tests/Makefile.in
4+++ b/tests/Makefile.in 4+++ b/tests/Makefile.in
5@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf 5@@ -18,7 +18,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
@@ -7,21 +7,21 @@ index 60cf655..ce220f1 100644
7 @echo "HTREE=y" >> test_one 7 @echo "HTREE=y" >> test_one
8 @echo "QUOTA=y" >> test_one 8 @echo "QUOTA=y" >> test_one
9- @echo "SRCDIR=@srcdir@" >> test_one 9- @echo "SRCDIR=@srcdir@" >> test_one
10+ @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_one 10+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_one
11 @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one 11 @echo "DIFF_OPTS=@UNI_DIFF_OPTS@" >> test_one
12 @echo "SIZEOF_TIME_T=@SIZEOF_TIME_T@" >> test_one
12 @cat $(srcdir)/test_one.in >> test_one 13 @cat $(srcdir)/test_one.in >> test_one
13 @chmod +x test_one 14@@ -27,7 +27,7 @@ test_one: $(srcdir)/test_one.in Makefile mke2fs.conf
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 15 test_script: test_one test_script.in Makefile mke2fs.conf
16 @echo "Creating test_script..." 16 @echo "Creating test_script..."
17 @echo "#!/bin/sh" > test_script 17 @echo "#!/bin/sh" > test_script
18- @echo "SRCDIR=@srcdir@" >> test_script 18- @echo "SRCDIR=@srcdir@" >> test_script
19+ @echo "SRCDIR=/usr/lib/e2fsprogs/ptest/test" >> test_script 19+ @echo "SRCDIR=${prefix}${libdir}/e2fsprogs/ptest/test" >> test_script
20 @cat $(srcdir)/test_script.in >> test_script 20 @cat $(srcdir)/test_script.in >> test_script
21 @chmod +x test_script 21 @chmod +x test_script
22 22
23diff --git a/tests/test_config b/tests/test_config 23diff --git a/tests/test_config b/tests/test_config
24index 7f39157..c815a44 100644 24index 547ef4c..e11e6f4 100644
25--- a/tests/test_config 25--- a/tests/test_config
26+++ b/tests/test_config 26+++ b/tests/test_config
27@@ -3,24 +3,24 @@ 27@@ -3,24 +3,24 @@
@@ -65,3 +65,16 @@ index 7f39157..c815a44 100644
65 CLEAN_OUTPUT="sed -f $cmd_dir/filter.sed" 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} 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} 67 DYLD_LIBRARY_PATH=../lib:../lib/ext2fs:../lib/e2p:../lib/et:../lib/ss:${DYLD_LIBRARY_PATH}
68diff --git a/tests/test_script.in b/tests/test_script.in
69index 9959e30..442999d 100644
70--- a/tests/test_script.in
71+++ b/tests/test_script.in
72@@ -39,7 +39,7 @@ for i; do
73 done
74
75 if test "$TESTS"x = x ; then
76- if test -n "DO_FAILED"; then
77+ if test -n "$DO_FAILED"; then
78 exit 0
79 fi
80 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