./0000775000175000017500000000000012621057247011443 5ustar nielsenrnielsenr./build-tests.patch0000664000175000017500000000337312511411357014723 0ustar nielsenrnielsenrAdd 'ptest' target to Makefile, to run tests without checking dependencies. Upstream-Status: Pending Signed-off-by: Anders Roxell Signed-off-by: Hongxu Jia --- Makefile.in | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/Makefile.in b/Makefile.in --- a/Makefile.in +++ b/Makefile.in @@ -848,20 +848,34 @@ maybe-clean: fi recho$(EXEEXT): $(SUPPORT_SRC)recho.c - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)recho.c ${LIBS_FOR_BUILD} + @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< zecho$(EXEEXT): $(SUPPORT_SRC)zecho.c - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)zecho.c ${LIBS_FOR_BUILD} + @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< printenv$(EXEEXT): $(SUPPORT_SRC)printenv.c - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)printenv.c ${LIBS_FOR_BUILD} + @$(CC) $(CCFLAGS) ${LDFLAGS} -o $@ $< xcase$(EXEEXT): $(SUPPORT_SRC)xcase.c - @$(CC_FOR_BUILD) $(CCFLAGS_FOR_BUILD) ${LDFLAGS_FOR_BUILD} -o $@ $(SUPPORT_SRC)xcase.c ${LIBS_FOR_BUILD} + @$(CC) $(CCFLAGS) ${LDFLAGS} -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} ) -- 1.8.1.2 ./test-output.patch0000664000175000017500000000112212511411357014767 0ustar nielsenrnielsenrAdd FAIL/PASS output to test output. Signed-off-by: Björn Stenberg 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 ./run-ptest0000664000175000017500000000007012511411357013316 0ustar nielsenrnielsenr#!/bin/sh make -k THIS_SH=/bin/bash BUILD_DIR=. runtest ./execute_cmd.patch0000664000175000017500000000122012511411357014736 0ustar nielsenrnielsenrUpstream-Status: Inappropriate [embedded specific] --- execute_cmd.c.orig Fri Jun 3 13:34:42 2011 +++ execute_cmd.c Fri Jun 3 13:36:41 2011 @@ -2202,7 +2202,11 @@ /* If the `lastpipe' option is set with shopt, and job control is not enabled, execute the last element of non-async pipelines in the current shell environment. */ - if (lastpipe_opt && job_control == 0 && asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) + if (lastpipe_opt && +#if defined(JOB_CONTROL) + job_control == 0 && +#endif + asynchronous == 0 && pipe_out == NO_PIPE && prev > 0) { lstdin = move_to_high_fd (0, 0, 255); if (lstdin > 0) ./mkbuiltins_have_stringize.patch0000664000175000017500000000167612511411357017752 0ustar nielsenrnielsenrOn hosts with FORTIFY_SOURCES, stringize support is required, as it's used by the macros to wrap functions (e.g. read and open in unistd.h). Those wrappers use the STRING() macro from unistd.h. A header in the bash sources overrides the unistd.h macro to 'x' when HAVE_STRINGIZE is not defined, causing the wrappers to generate calls to 'xread' and 'xopen', which do not exist, resulting in a failure to link. Assume we have stringize support when cross-compiling, which works around the issue. It may be best for upstream to either give up on supporting compilers without stringize support, or to not define STRING() at all when FORTIFY_SOURCES is defined, letting the unistd.h one be used, instead. Upstream-Status: Pending --- bash-4.2.orig/builtins/mkbuiltins.c +++ bash-4.2/builtins/mkbuiltins.c @@ -28,6 +28,7 @@ # define HAVE_STDLIB_H # define HAVE_RENAME +# define HAVE_STRINGIZE #endif /* CROSS_COMPILING */ #if defined (HAVE_UNISTD_H)