Re: [PATCH] bash: Add ptest

[Muhammad Shakeel <muhammad_shakeel@mentor.com>]

On 07/05/2013 12:23 PM, Shakeel, Muhammad wrote:
> From: Muhammad Shakeel <muhammad_shakeel@mentor.com>
>
> ptest support was already added for v4.2 but for the distros
> using GPLv2 version of bash (3.2.48) this update is required.
>
> Signed-off-by: Muhammad Shakeel <muhammad_shakeel@mentor.com>
> ---
>   .../bash/bash-3.2.48/build-tests.patch             |   44 ++++++++++++++++++++
>   meta/recipes-extended/bash/bash-3.2.48/run-ptest   |    2 +
>   .../bash/bash-3.2.48/test-output.patch             |   25 +++++++++++
>   meta/recipes-extended/bash/bash_3.2.48.bb          |    3 ++
>   4 files changed, 74 insertions(+)
>
> diff --git a/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch b/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch
> new file mode 100644
> index 0000000..91341ee
> --- /dev/null
> +++ b/meta/recipes-extended/bash/bash-3.2.48/build-tests.patch
> @@ -0,0 +1,44 @@
> +Add 'ptest' target to Makefile, to run tests without checking dependencies.
> +
> +Signed-off-by: Anders Roxell <anders.roxell@enea.com>
> +Upstream-Status: Pending
> +---
> +diff -dNaur bash-3.2.48/Makefile.in.orig bash-3.2.48/Makefile.in
> +--- bash-3.2.48/Makefile.in.orig	2006-08-17 23:03:35.000000000 +0500
> ++++ bash-3.2.48/Makefile.in	2013-07-02 20:20:07.512709327 +0500
> +@@ -803,17 +803,31 @@
> + 	fi
> +
> + recho$(EXEEXT):		$(SUPPORT_SRC)recho.c
> +-	@$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)recho.c ${LIBS_FOR_BUILD}
> ++	@$(CC) $(CCFLAGS) -o $@ $<
> +
> + zecho$(EXEEXT):		$(SUPPORT_SRC)zecho.c
> +-	@$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)zecho.c ${LIBS_FOR_BUILD}
> ++	@$(CC) $(CCFLAGS) -o $@ $<
> +
> + printenv$(EXEEXT):	$(SUPPORT_SRC)printenv.c
> +-	@$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) -o $@ $(SUPPORT_SRC)printenv.c ${LIBS_FOR_BUILD}
> ++	@$(CC) $(CCFLAGS) -o $@ $<
> +
> +-test tests check:	force $(Program) $(TESTS_SUPPORT)
> ++test tests check:
> ++	@$(MAKE) install-test
> ++	@$(MAKE) runtest
> ++
> ++install-test: buildtest
> ++ifeq ($(origin INSTALL_TEST_DIR), undefined)
> + 	@-test -d tests || mkdir tests
> + 	@cp $(TESTS_SUPPORT) tests
> ++else
> ++	@-test -d $(INSTALL_TEST_DIR) || mkdir -p $(INSTALL_TEST_DIR)
> ++	@cp -r $(srcdir)/tests/* $(INSTALL_TEST_DIR)/
> ++	@cp $(TESTS_SUPPORT) $(INSTALL_TEST_DIR)
> ++endif
> ++
> ++buildtest: force $(Program) $(TESTS_SUPPORT)
> ++
> ++runtest:
> + 	@( cd $(srcdir)/tests && \
> + 		PATH=$(BUILD_DIR)/tests:$$PATH THIS_SH=$(THIS_SH) $(SHELL) ${TESTSCRIPT} )
> +
> diff --git a/meta/recipes-extended/bash/bash-3.2.48/run-ptest b/meta/recipes-extended/bash/bash-3.2.48/run-ptest
> new file mode 100644
> index 0000000..8dd3b99
> --- /dev/null
> +++ b/meta/recipes-extended/bash/bash-3.2.48/run-ptest
> @@ -0,0 +1,2 @@
> +#!/bin/sh
> +make -k THIS_SH=/bin/bash BUILD_DIR=. runtest
> diff --git a/meta/recipes-extended/bash/bash-3.2.48/test-output.patch b/meta/recipes-extended/bash/bash-3.2.48/test-output.patch
> new file mode 100644
> index 0000000..2b09b7d
> --- /dev/null
> +++ b/meta/recipes-extended/bash/bash-3.2.48/test-output.patch
> @@ -0,0 +1,25 @@
> +Add FAIL/PASS output to test output.
> +
> +Signed-off-by: Björn Stenberg <bjst@enea.com>
> +Upstream-Status: Pending
> +---
> +diff -uNr a/tests/run-all b/tests/run-all
> +--- a/tests/run-all	1999-10-08 17:07:46.000000000 +0200
> ++++ b/tests/run-all	2012-10-27 21:04:18.663331887 +0200
> +@@ -22,7 +22,15 @@
> + 	case $x in
> + 	$0|run-minimal|run-gprof)	;;
> + 	*.orig|*~) ;;
> +-	*)	echo $x ; sh $x ;;
> ++    *)  echo $x
> ++         output=`sh $x`
> ++         if [ -n "$output" ]; then
> ++             echo "$output"
> ++             echo "FAIL: $x"
> ++         else
> ++             echo "PASS: $x"
> ++         fi
> ++         ;;
> + 	esac
> + done
> +
> diff --git a/meta/recipes-extended/bash/bash_3.2.48.bb b/meta/recipes-extended/bash/bash_3.2.48.bb
> index 4e6f0f3..fe04b28 100644
> --- a/meta/recipes-extended/bash/bash_3.2.48.bb
> +++ b/meta/recipes-extended/bash/bash_3.2.48.bb
> @@ -10,6 +10,9 @@ SRC_URI = "${GNU_MIRROR}/bash/bash-${PV}.tar.gz;name=tarball \
>              ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-050;apply=yes;striplevel=0;name=patch002 \
>              ${GNU_MIRROR}/bash/bash-3.2-patches/bash32-051;apply=yes;striplevel=0;name=patch003 \
>              file://mkbuiltins_have_stringize.patch \
> +           file://build-tests.patch \
> +           file://test-output.patch \
> +           file://run-ptest \
>             "
>   
>   SRC_URI[tarball.md5sum] = "338dcf975a93640bb3eaa843ca42e3f8"
Hi Saul,

Can you please comment on the status of this patch?

Best Regards
Shakeel