summaryrefslogtreecommitdiffstats
path: root/meta
diff options
context:
space:
mode:
Diffstat (limited to 'meta')
-rw-r--r--meta/recipes-extended/bash/bash-4.2/build-tests.patch48
-rw-r--r--meta/recipes-extended/bash/bash-4.2/run-ptest2
-rw-r--r--meta/recipes-extended/bash/bash-4.2/test-output.patch25
-rw-r--r--meta/recipes-extended/bash/bash.inc16
-rw-r--r--meta/recipes-extended/bash/bash_4.2.bb3
5 files changed, 93 insertions, 1 deletions
diff --git a/meta/recipes-extended/bash/bash-4.2/build-tests.patch b/meta/recipes-extended/bash/bash-4.2/build-tests.patch
new file mode 100644
index 0000000000..036088116d
--- /dev/null
+++ b/meta/recipes-extended/bash/bash-4.2/build-tests.patch
@@ -0,0 +1,48 @@
1Add 'ptest' target to Makefile, to run tests without checking dependencies.
2
3Signed-off-by: Anders Roxell <anders.roxell@enea.com>
4Upstream-Status: Pending
5---
6diff -uNr a/Makefile.in b/Makefile.in
7--- a/Makefile.in 2012-11-06 08:40:07.552403063 +0100
8+++ b/Makefile.in 2012-11-06 11:13:36.958297555 +0100
9@@ -827,20 +827,34 @@
10 fi
11
12 recho$(EXEEXT): $(SUPPORT_SRC)recho.c
13- @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)recho.c ${LIBS_FOR_BUILD}
14+ @$(CC) $(CCFLAGS) -o $@ $<
15
16 zecho$(EXEEXT): $(SUPPORT_SRC)zecho.c
17- @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)zecho.c ${LIBS_FOR_BUILD}
18+ @$(CC) $(CCFLAGS) -o $@ $<
19
20 printenv$(EXEEXT): $(SUPPORT_SRC)printenv.c
21- @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)printenv.c ${LIBS_FOR_BUILD}
22+ @$(CC) $(CCFLAGS) -o $@ $<
23
24 xcase$(EXEEXT): $(SUPPORT_SRC)xcase.c
25- @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)xcase.c ${LIBS_FOR_BUILD}
26+ @$(CC) $(CCFLAGS) -o $@ $<
27
28-test tests check: force $(Program) $(TESTS_SUPPORT)
29+test tests check:
30+ @$(MAKE) install-test
31+ @$(MAKE) runtest
32+
33+install-test: buildtest
34+ifeq ($(origin INSTALL_TEST_DIR), undefined)
35 @-test -d tests || mkdir tests
36 @cp $(TESTS_SUPPORT) tests
37+else
38+ @-test -d $(INSTALL_TEST_DIR) || mkdir -p $(INSTALL_TEST_DIR)
39+ @cp -r $(srcdir)/tests/* $(INSTALL_TEST_DIR)/
40+ @cp $(TESTS_SUPPORT) $(INSTALL_TEST_DIR)
41+endif
42+
43+buildtest: force $(Program) $(TESTS_SUPPORT)
44+
45+runtest:
46 @( cd $(srcdir)/tests && \
47 PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
48
diff --git a/meta/recipes-extended/bash/bash-4.2/run-ptest b/meta/recipes-extended/bash/bash-4.2/run-ptest
new file mode 100644
index 0000000000..66f1eee543
--- /dev/null
+++ b/meta/recipes-extended/bash/bash-4.2/run-ptest
@@ -0,0 +1,2 @@
1#!/bin/sh
2echo Makefile: | make -f Makefile -f - -k THIS_SH=/bin/bash BUILD_DIR=. runtest
diff --git a/meta/recipes-extended/bash/bash-4.2/test-output.patch b/meta/recipes-extended/bash/bash-4.2/test-output.patch
new file mode 100644
index 0000000000..7d0ce63f30
--- /dev/null
+++ b/meta/recipes-extended/bash/bash-4.2/test-output.patch
@@ -0,0 +1,25 @@
1Add FAIL/PASS output to test output.
2
3Signed-off-by: Björn Stenberg <bjst@enea.com>
4Upstream-status: Pending
5---
6diff -uNr a/tests/run-all b/tests/run-all
7--- a/tests/run-all 1999-10-08 17:07:46.000000000 +0200
8+++ b/tests/run-all 2012-10-27 21:04:18.663331887 +0200
9@@ -22,7 +22,15 @@
10 case $x in
11 $0|run-minimal|run-gprof) ;;
12 *.orig|*~) ;;
13- *) echo $x ; sh $x ;;
14+ *) echo $x
15+ output=`sh $x`
16+ if [ -n "$output" ]; then
17+ echo "$output"
18+ echo "FAIL: $x"
19+ else
20+ echo "PASS: $x"
21+ fi
22+ ;;
23 esac
24 done
25
diff --git a/meta/recipes-extended/bash/bash.inc b/meta/recipes-extended/bash/bash.inc
index f1de931e82..20a23f030f 100644
--- a/meta/recipes-extended/bash/bash.inc
+++ b/meta/recipes-extended/bash/bash.inc
@@ -4,7 +4,7 @@ SECTION = "base/shell"
4 4
5DEPENDS = "ncurses bison-native" 5DEPENDS = "ncurses bison-native"
6 6
7inherit autotools gettext update-alternatives 7inherit autotools gettext update-alternatives ptest
8 8
9PARALLEL_MAKE = "" 9PARALLEL_MAKE = ""
10 10
@@ -17,18 +17,32 @@ ALTERNATIVE_PRIORITY = "100"
17 17
18export AUTOHEADER = "true" 18export AUTOHEADER = "true"
19 19
20RDEPENDS_${PN}-ptest += "make"
21
20do_configure_prepend () { 22do_configure_prepend () {
21 if [ ! -e acinclude.m4 ]; then 23 if [ ! -e acinclude.m4 ]; then
22 cat aclocal.m4 > acinclude.m4 24 cat aclocal.m4 > acinclude.m4
23 fi 25 fi
24} 26}
25 27
28do_compile_append () {
29 if [ "${PN}" = "${BPN}" -a ${PTEST_ENABLED} = "1" ]; then
30 oe_runmake buildtest
31 fi
32}
33
26do_install_append () { 34do_install_append () {
27 # Move /usr/bin/bash to /bin/bash, if need 35 # Move /usr/bin/bash to /bin/bash, if need
28 if [ "${base_bindir}" != "${bindir}" ]; then 36 if [ "${base_bindir}" != "${bindir}" ]; then
29 mkdir -p ${D}${base_bindir} 37 mkdir -p ${D}${base_bindir}
30 mv ${D}${bindir}/bash ${D}${base_bindir} 38 mv ${D}${bindir}/bash ${D}${base_bindir}
31 fi 39 fi
40
41 if [ "${PN}" = "${BPN}" -a ${PTEST_ENABLED} = "1" ]; then
42 ptest_do_install
43 make INSTALL_TEST_DIR=${D}${PTEST_PATH}/tests install-test
44 cp ${B}/Makefile ${D}${PTEST_PATH}
45 fi
32} 46}
33 47
34pkg_postinst_${PN} () { 48pkg_postinst_${PN} () {
diff --git a/meta/recipes-extended/bash/bash_4.2.bb b/meta/recipes-extended/bash/bash_4.2.bb
index 07dda09e83..fefe7b799d 100644
--- a/meta/recipes-extended/bash/bash_4.2.bb
+++ b/meta/recipes-extended/bash/bash_4.2.bb
@@ -19,6 +19,9 @@ SRC_URI = "${GNU_MIRROR}/bash/${BPN}-${PV}.tar.gz;name=tarball \
19 ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-010;apply=yes;striplevel=0;name=patch010 \ 19 ${GNU_MIRROR}/bash/bash-4.2-patches/bash42-010;apply=yes;striplevel=0;name=patch010 \
20 file://execute_cmd.patch;striplevel=0 \ 20 file://execute_cmd.patch;striplevel=0 \
21 file://mkbuiltins_have_stringize.patch \ 21 file://mkbuiltins_have_stringize.patch \
22 file://build-tests.patch \
23 file://test-output.patch \
24 file://run-ptest \
22 " 25 "
23 26
24SRC_URI[tarball.md5sum] = "3fb927c7c33022f1c327f14a81c0d4b0" 27SRC_URI[tarball.md5sum] = "3fb927c7c33022f1c327f14a81c0d4b0"