meta: fix rdepends issues for test related packages

PATCH New Robert Yang 1 participant 7 messages Aug 18, 2014

lore

Share & tools

lore

Robert Yang

author

2014-08-18 06:06 UTC #0 lore raw

cover meta: fix rdepends issues for test related packages

* Fix rdepends issues for test related packages
* Debash for bootchart2

// Robert

The following changes since commit d0be4b37743492fc9c178fd6f9ef73a5eb2fd9c3:

chrpath: Drop warning from darwn builds (2014-08-17 10:01:30 +0100)

are available in the git repository at:

git://git.openembedded.org/openembedded-core-contrib rbt/test
http://cgit.openembedded.org/cgit.cgi/openembedded-core-contrib/log/?h=rbt/test

Robert Yang (6):
meta: fix RDEPNEDS for the test related pkgs
sed: add sed to RDEPENDS sed-ptest
lsbtest: no bashism in LSB_Test.sh
run-ptest: fix bashism valgrind/oprofile/systemd: no need bash in run-ptest
bootchart2: no bashism in bootchartd.in

 meta/recipes-core/libxml/libxml2.inc               |    2 ++
 meta/recipes-core/systemd/systemd/run-ptest        |    2 ++
 meta/recipes-core/udev/udev.inc                    |    2 +-
 .../bootchart2/bootchartd-no-bashism.patch         |   27 ++++++++++++++++++++
 meta/recipes-devtools/bootchart2/bootchart2_git.bb |    6 +++--
 meta/recipes-devtools/insserv/files/run-ptest      |    2 +-
 meta/recipes-devtools/quilt/quilt-0.63.inc         |    2 +-
 meta/recipes-devtools/quilt/quilt/run-ptest        |    2 +-
 meta/recipes-devtools/tcltk/tcl/run-ptest          |    4 +--
 meta/recipes-devtools/valgrind/valgrind/run-ptest  |    3 ++-
 meta/recipes-extended/gawk/gawk-4.1.1/run-ptest    |    4 +--
 meta/recipes-extended/lsb/lsbtest/LSB_Test.sh      |    2 +-
 meta/recipes-extended/pam/libpam_1.1.6.bb          |   11 ++++++--
 meta/recipes-extended/sed/sed_4.2.2.bb             |    2 +-
 meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb     |    2 +-
 meta/recipes-kernel/oprofile/oprofile/run-ptest    |    3 ++-
 meta/recipes-support/beecrypt/beecrypt/run-ptest   |    2 +-
 17 files changed, 60 insertions(+), 18 deletions(-)
 create mode 100644 meta/recipes-devtools/bootchart2/bootchart2/bootchartd-no-bashism.patch

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-08-18 06:06 UTC #1 lore raw

PATCH 1/6 meta: fix RDEPNEDS for the test related pkgs

Add bash, python or perl to the ptest pkgs to fix the RDEPENDS issues.

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-core/libxml/libxml2.inc           |    2 ++
 meta/recipes-core/udev/udev.inc                |    2 +-
 meta/recipes-extended/pam/libpam_1.1.6.bb      |   11 +++++++++--
 meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb |    2 +-
 4 files changed, 13 insertions(+), 4 deletions(-)

meta/recipes-core/libxml/libxml2.inc +2 -0

index 2dffc5a..10f3d34 100644
@@ -27,6 +27,8 @@ BINCONFIG = "${bindir}/xml2-config"
 
 inherit autotools pkgconfig binconfig-disabled pythonnative ptest
 
+RDEPENDS_${PN}-ptest += "python-core"
+
 RDEPENDS_${PN}-ptest_append_libc-glibc += "eglibc-gconv-ebcdic-us eglibc-gconv-ibm1141"
 
 # We don't DEPEND on binutils for ansidecl.h so ensure we don't use the header

meta/recipes-core/udev/udev.inc +1 -1

index 11204aa..280da10 100644
@@ -31,7 +31,7 @@ SRC_URI = "${KERNELORG_MIRROR}/linux/utils/kernel/hotplug/udev-${PV}.tar.gz \
            file://init"
 
 inherit autotools pkgconfig update-rc.d ptest
-RDEPENDS_${PN}-ptest += "make"
+RDEPENDS_${PN}-ptest += "make perl"
 
 libexecdir = "${base_libdir}"
 EXTRA_OECONF = "--disable-introspection \

meta/recipes-extended/pam/libpam_1.1.6.bb +9 -2

index c06709f..d7033d0 100644
@@ -72,8 +72,15 @@ libpam_suffix = "suffix${@get_multilib_bit(d)}"
 RPROVIDES_${PN} += "${PN}-${libpam_suffix}"
 RPROVIDES_${PN}-runtime += "${PN}-runtime-${libpam_suffix}"
 
-RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} pam-plugin-deny-${libpam_suffix} pam-plugin-permit-${libpam_suffix} pam-plugin-warn-${libpam_suffix} pam-plugin-unix-${libpam_suffix}"
-RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} pam-plugin-access-${libpam_suffix} pam-plugin-debug-${libpam_suffix} pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} coreutils"
+RDEPENDS_${PN}-runtime = "${PN}-${libpam_suffix} \
+    pam-plugin-deny-${libpam_suffix} pam-plugin-permit-${libpam_suffix} \
+    pam-plugin-warn-${libpam_suffix} pam-plugin-unix-${libpam_suffix} \
+    "
+RDEPENDS_${PN}-xtests = "${PN}-${libpam_suffix} \
+    pam-plugin-access-${libpam_suffix} pam-plugin-debug-${libpam_suffix} \
+    pam-plugin-cracklib-${libpam_suffix} pam-plugin-pwhistory-${libpam_suffix} \
+    pam-plugin-succeed-if-${libpam_suffix} pam-plugin-time-${libpam_suffix} \
+    coreutils bash"
 #RRECOMMENDS_${PN} = "${PN}-runtime-${libpam_suffix}"
 
 python populate_packages_prepend () {

meta/recipes-kernel/lttng/lttng-tools_2.5.0.bb +1 -1

index 14e5f9e..560a243 100644
@@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=01d7fc4496aacf37d90df90b90b0cac1 \
                     file://lgpl-2.1.txt;md5=0f0d71500e6a57fd24d825f33242b9ca"
 
 DEPENDS = "liburcu popt lttng-ust libxml2"
-RDEPENDS_${PN}-ptest += "make"
+RDEPENDS_${PN}-ptest += "make perl bash"
 
 SRCREV = "8b27cacb277c2cdab791139b08da8eb87ab14a88"
 PV = "v2.5.0"

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-08-18 06:06 UTC #2 lore raw

PATCH 2/6 sed: add sed to RDEPENDS sed-ptest

In reply to Robert Yang

Its test scripts require /bin/sed.

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-extended/sed/sed_4.2.2.bb |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-extended/sed/sed_4.2.2.bb +1 -1

index 74ac16b..ea39dae 100644
@@ -14,7 +14,7 @@ SRC_URI[md5sum] = "4111de4faa3b9848a0686b2f260c5056"
 SRC_URI[sha256sum] = "fea0a94d4b605894f3e2d5572e3f96e4413bcad3a085aae7367c2cf07908b2ff"
 
 inherit autotools texinfo update-alternatives gettext ptest
-RDEPENDS_${PN}-ptest += "make locale-base-ru-ru"
+RDEPENDS_${PN}-ptest += "make locale-base-ru-ru ${PN}"
 
 EXTRA_OECONF = "--disable-acl \
                 ${@bb.utils.contains('PTEST_ENABLED', '1', '--enable-regex-tests', '', d)}"

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-08-18 06:06 UTC #3 lore raw

PATCH 3/6 lsbtest: no bashism in LSB_Test.sh

In reply to Robert Yang

So use /bin/sh

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-extended/lsb/lsbtest/LSB_Test.sh |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

meta/recipes-extended/lsb/lsbtest/LSB_Test.sh +1 -1

index ab79985..b9971a1 100644
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 # Copyright (C) 2012 Wind River Systems, Inc.
 #

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-08-18 06:06 UTC #4 lore raw

PATCH 4/6 run-ptest: fix bashism

In reply to Robert Yang

These script use /bin/sh as the interpreter, but contains bashism:

    recipes-devtools/insserv/files/run-ptest
    recipes-devtools/quilt/quilt/run-ptest
    recipes-devtools/tcltk/tcl/run-ptest
    recipes-extended/gawk/gawk-4.1.1/run-ptest
    recipes-support/beecrypt/beecrypt/run-ptest

Fixed:

    "==" -> "=" (should be -eq when integer)
    "&>log" -> ">log 2>&1"

And quilt's test scripts requires bash, add bash to RDEPENDS_quilt-ptest

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-devtools/insserv/files/run-ptest    |    2 +-
 meta/recipes-devtools/quilt/quilt-0.63.inc       |    2 +-
 meta/recipes-devtools/quilt/quilt/run-ptest      |    2 +-
 meta/recipes-devtools/tcltk/tcl/run-ptest        |    4 ++--
 meta/recipes-extended/gawk/gawk-4.1.1/run-ptest  |    4 ++--
 meta/recipes-support/beecrypt/beecrypt/run-ptest |    2 +-
 6 files changed, 8 insertions(+), 8 deletions(-)

meta/recipes-devtools/insserv/files/run-ptest +1 -1

index 495d155..4a6da30 100644
@@ -11,7 +11,7 @@ output() {
 }
 
 for i in test_simple_sequence test_undetected_loop; \
-  do $i &>/dev/null ; output; \
+  do $i >/dev/null 2>&1; output; \
 done
 
 rm -rf ${tmpdir}

meta/recipes-devtools/quilt/quilt-0.63.inc +1 -1

index f375785..433d6b4 100644
@@ -55,5 +55,5 @@ do_install_ptest() {
 RDEPENDS_${PN}-ptest = "make file sed gawk diffutils findutils ed perl \
                         perl-module-filehandle perl-module-getopt-std \
                         perl-module-posix perl-module-file-temp \
-                        perl-module-text-parsewords \
+                        perl-module-text-parsewords bash \
 "

meta/recipes-devtools/quilt/quilt/run-ptest +1 -1

index 1ea0dae..958a9df 100755
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 ln -sf /bin/ed /usr/bin/ed
-for i in `ls test/*.test |awk -F. '{print $1}' |awk -F/ '{print $2}'`; do make check-$i; if [ $? == 0 ]; then echo PASS: $i.test; else echo FAIL: $i.test; fi; done
+for i in `ls test/*.test |awk -F. '{print $1}' |awk -F/ '{print $2}'`; do make check-$i; if [ $? -eq 0 ]; then echo PASS: $i.test; else echo FAIL: $i.test; fi; done
 rm -f /usr/bin/ed

meta/recipes-devtools/tcltk/tcl/run-ptest +2 -2

index a5d6548..dadba65 100644
@@ -1,8 +1,8 @@
 #!/bin/sh
 
 for i in `ls tests/*.test |awk -F/ '{print $2}'`; \
-    do TCL_LIBRARY=library ./tcltest tests/all.tcl -file $i &>$i.tmp; \
+    do TCL_LIBRARY=library ./tcltest tests/all.tcl -file $i >$i.tmp 2>&1; \
     grep -q "^Files with failing tests:" $i.tmp; \
-    if [ $? == 0 ]; then echo "FAIL: $i"; \
+    if [ $? -eq 0 ]; then echo "FAIL: $i"; \
     else echo "PASS: $i"; rm -f $i.tmp; fi; \
 done

meta/recipes-extended/gawk/gawk-4.1.1/run-ptest +2 -2

index 7d214ea..d23f0bf 100644
@@ -3,8 +3,8 @@
 cd test
 for i in `grep -vE "@|^$|#|Gt-dummy" Maketests |awk -F: '{print $1}'`; \
   do LC_ALL=${GAWKLOCALE:-C} LANG=${GAWKLOCALE:-C} srcdir=`pwd` AWK=gawk CMP=cmp \
-  make -f Maketests $i &>$i.tmp; \
+  make -f Maketests $i >$i.tmp 2>&1; \
   grep -q "Error" $i.tmp; \
-  if [ $? == 0 ]; then echo "FAIL: $i"; \
+  if [ $? -eq 0 ]; then echo "FAIL: $i"; \
   else echo "PASS: $i"; rm -f $i.tmp; fi; \
 done

meta/recipes-support/beecrypt/beecrypt/run-ptest +1 -1

index 5bc7460..2ee294d 100644
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 cd tests
-for i in `ls`; do ./$i; if [ $? == 0 ]; then echo "PASS: $i"; \
+for i in `ls`; do ./$i; if [ $? -eq 0 ]; then echo "PASS: $i"; \
     else echo "FAIL: $i"; fi; done

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-08-18 06:06 UTC #5 lore raw

PATCH 5/6 valgrind/oprofile/systemd: no need bash in run-ptest

In reply to Robert Yang

There is no bashism in the scripts, so use /bin/sh.

Signed-off-by Robert Yang <[email protected]>

---
 meta/recipes-core/systemd/systemd/run-ptest       |    2 ++
 meta/recipes-devtools/valgrind/valgrind/run-ptest |    3 ++-
 meta/recipes-kernel/oprofile/oprofile/run-ptest   |    3 ++-
 3 files changed, 6 insertions(+), 2 deletions(-)

meta/recipes-core/systemd/systemd/run-ptest +2 -0

index 2f6bd93..a2d61c2 100644
@@ -1,3 +1,5 @@
+#!/bin/sh
+
 tar -C test -xJf test/sys.tar.xz
 make test/rules-test.sh.log
 make test/udev-test.pl.log

meta/recipes-devtools/valgrind/valgrind/run-ptest +2 -1

index 7d0584a..f9a72ec 100755
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/bin/sh
+
 # run-ptest - 'ptest' test infrastructure shell script that
 #   wraps the valgrind regression script vg_regtest. 
 #   Must be run in the /usr/lib/valgrind/ptest directory.

meta/recipes-kernel/oprofile/oprofile/run-ptest +2 -1

index 583ee1b..4814be6 100644
@@ -1,4 +1,5 @@
-#!/bin/bash
+#!/bin/sh
+
 saved_dir=$PWD
 for dir in */tests ; do
 	cd $dir

Signature · 1 line

1.7.9.5

Robert Yang

author

2014-08-18 06:06 UTC #6 lore raw

PATCH 6/6 bootchart2: no bashism in bootchartd.in

In reply to Robert Yang

So use /bin/sh.

Signed-off-by Robert Yang <[email protected]>

---
 .../bootchart2/bootchartd-no-bashism.patch         |   27 ++++++++++++++++++++
 meta/recipes-devtools/bootchart2/bootchart2_git.bb |    6 +++--
 2 files changed, 31 insertions(+), 2 deletions(-)
 create mode 100644 meta/recipes-devtools/bootchart2/bootchart2/bootchartd-no-bashism.patch

meta/recipes-devtools/bootchart2/bootchart2/bootchartd-no-bashism.patch new file +27 -0

new file mode 100644
index 0000000..b013995
@@ -0,0 +1,27 @@
+From ffb5bae5d588aaea6325623462a8070a04767196 Mon Sep 17 00:00:00 2001
+From: Robert Yang <[email protected]>
+Date: Thu, 14 Aug 2014 08:33:28 -0700
+Subject: [PATCH] bootchartd.in: no bashism
+
+No bashism in bootchartd.in, so use /bin/sh.
+
+Upstream-Status: Pending
+
+Signed-off-by: Robert Yang <[email protected]>
+---
+ bootchartd.in |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/bootchartd.in b/bootchartd.in
+index a408bab..064f6a4 100755
+--- a/bootchartd.in
++++ b/bootchartd.in
+@@ -1,4 +1,4 @@
+-#!/bin/bash
++#!/bin/sh
+ #
+ # Bootchart logger script
+ # Ziga Mahkovec  <[email protected]>
+-- 
+1.7.9.5
+

meta/recipes-devtools/bootchart2/bootchart2_git.bb +4 -2

index 4116304..04fb901 100644
@@ -91,8 +91,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=44ac4678311254db62edf8fd39cb8124"
 # one commit beyond 1.14.6 for a systemd-related bugfix
 PV = "0.14.6+git${SRCPV}"
 
-SRC_URI = "git://github.com/mmeeks/bootchart.git"
-SRC_URI += "file://bootchartd_stop.sh"
+SRC_URI = "git://github.com/mmeeks/bootchart.git \
+           file://bootchartd_stop.sh \
+           file://bootchartd-no-bashism.patch \
+          "
 
 SRCREV = "b65ed43b0ae832080fb728245de9ef1a4b48d8b5"

Signature · 1 line

1.7.9.5