This is an automated email from the git hooks/post-receive script. infinity0 pushed a commit to branch _testing_more-debugging-output in repository ocaml.
commit 4e61c3289796a79064b429740533f421c98ab31b Author: Ximin Luo <infini...@debian.org> Date: Thu Oct 20 15:15:14 2016 +0200 Print more debugging output during tests --- debian/patches/more-test-debugging-info.patch | 177 ++++++++++++++++++++++++++ debian/patches/series | 1 + 2 files changed, 178 insertions(+) diff --git a/debian/patches/more-test-debugging-info.patch b/debian/patches/more-test-debugging-info.patch new file mode 100644 index 0000000..a3fc8c0 --- /dev/null +++ b/debian/patches/more-test-debugging-info.patch @@ -0,0 +1,177 @@ +--- a/testsuite/Makefile ++++ b/testsuite/Makefile +@@ -14,8 +14,7 @@ + #************************************************************************** + + BASEDIR := $(shell pwd) +-NO_PRINT=`$(MAKE) empty --no-print-directory >/dev/null 2>&1 \ +- && echo --no-print-directory` ++NO_PRINT= + + FIND=find + include ../config/Makefile +@@ -41,7 +40,7 @@ + + .PHONY: all + all: lib +- @for dir in tests/*; do \ ++ for dir in tests/*; do \ + $(MAKE) $(NO_PRINT) exec-one DIR=$$dir; \ + done 2>&1 | tee _log + @$(MAKE) $(NO_PRINT) retries +@@ -125,7 +124,7 @@ + + .PHONY: exec-one + exec-one: +- @if [ ! -f $(DIR)/Makefile ]; then \ ++ if [ ! -f $(DIR)/Makefile ]; then \ + for dir in $(DIR)/*; do \ + if [ -d $$dir ]; then \ + $(MAKE) exec-one DIR=$$dir; \ +@@ -134,7 +133,7 @@ + else \ + echo "Running tests from '$$DIR' ..."; \ + cd $(DIR) && \ +- $(MAKE) TERM=dumb BASEDIR=$(BASEDIR) || echo '=> unexpected error'; \ ++ $(MAKE) TERM=dumb BASEDIR=$(BASEDIR) || echo '=>' 'unexpected' 'error'; \ + fi + + .PHONY: clean-one +--- a/testsuite/makefiles/Makefile.common ++++ b/testsuite/makefiles/Makefile.common +@@ -102,13 +102,13 @@ + UNIXLIBVAR=`case "$(OTHERLIBRARIES)" in *win32unix*) echo win32;; esac` + + defaultpromote: +- @for file in *.reference; do \ ++ for file in *.reference; do \ + cp `basename $$file reference`result $$file; \ + done + + defaultclean: +- @rm -f *.cmo *.cmi *.cmx *.cma *.cmxa *.cmxs *.$(O) *.$(SO) *.$(A) *.exe +- @for dsym in *.dSYM; do \ ++ rm -f *.cmo *.cmi *.cmx *.cma *.cmxa *.cmxs *.$(O) *.$(SO) *.$(A) *.exe ++ for dsym in *.dSYM; do \ + if [ -d $$dsym ]; then \ + rm -fr $$dsym; \ + fi \ +@@ -118,49 +118,49 @@ + .SUFFIXES: .mli .ml .mly .mll .cmi .cmo .cmx .cmm .cmxa .s .S .$(O) .so .c .f + + .mli.cmi: +- @$(OCAMLC) -c $(ADD_COMPFLAGS) $< ++ $(OCAMLC) -c $(ADD_COMPFLAGS) $< + + .ml.cmi: +- @$(OCAMLC) -c $(ADD_COMPFLAGS) $< ++ $(OCAMLC) -c $(ADD_COMPFLAGS) $< + + .ml.cmo: +- @if [ -f $<i ]; then $(OCAMLC) -c $(ADD_COMPFLAGS) $<i; fi +- @$(OCAMLC) -c $(ADD_COMPFLAGS) $< ++ if [ -f $<i ]; then $(OCAMLC) -c $(ADD_COMPFLAGS) $<i; fi ++ $(OCAMLC) -c $(ADD_COMPFLAGS) $< + + .ml.cmx: +- @$(OCAMLOPT) -c $(ADD_COMPFLAGS) $< ++ $(OCAMLOPT) -c $(ADD_COMPFLAGS) $< + + .cmx.so: +- @$(OCAMLOPT) -o $@ -shared $(ADD_COMPFLAGS) $< ++ $(OCAMLOPT) -o $@ -shared $(ADD_COMPFLAGS) $< + + .cmxa.so: +- @$(OCAMLOPT) -o $@ -shared -linkall $(ADD_COMPFLAGS) $< ++ $(OCAMLOPT) -o $@ -shared -linkall $(ADD_COMPFLAGS) $< + + %.ml %.mli: %.mly +- @$(OCAMLYACC) -q $< 2> /dev/null ++ $(OCAMLYACC) -q $< 2> /dev/null + + .mll.ml: +- @$(OCAMLLEX) -q $< > /dev/null ++ $(OCAMLLEX) -q $< > /dev/null + + .cmm.o: +- @$(OCAMLRUN) ./codegen $*.cmm > $*.s +- @$(ASM) -o $*.o $*.s ++ $(OCAMLRUN) ./codegen $*.cmm > $*.s ++ $(ASM) -o $*.o $*.s + + .cmm.obj: +- @$(OCAMLRUN) ./codegen $*.cmm \ ++ $(OCAMLRUN) ./codegen $*.cmm \ + | grep -v "_caml_\(young_ptr\|young_limit\|extra_params\ + \|allocN\|raise_exn\|reraise_exn\)" > $*.s +- @set -o pipefail ; \ ++ set -o pipefail ; \ + $(ASM) $*.obj $*.s | tail -n +2 + + .S.o: +- @$(ASPP) $(ASPPFLAGS) -DSYS_$(SYSTEM) -DMODEL_$(MODEL) -o $*.o $*.S ++ $(ASPP) $(ASPPFLAGS) -DSYS_$(SYSTEM) -DMODEL_$(MODEL) -o $*.o $*.S + + .s.o: +- @$(ASPP) $(ASPPFLAGS) -DSYS_$(SYSTEM) -o $*.o $*.s ++ $(ASPP) $(ASPPFLAGS) -DSYS_$(SYSTEM) -o $*.o $*.s + + .c.o: +- @$(CC) -c -I$(CTOPDIR)/byterun $*.c -o $*.$(O) ++ $(CC) -c -I$(CTOPDIR)/byterun $*.c -o $*.$(O) + + .f.o: +- @$(FORTRAN_COMPILER) -c -I$(CTOPDIR)/byterun $*.f -o $*.$(O) ++ $(FORTRAN_COMPILER) -c -I$(CTOPDIR)/byterun $*.f -o $*.$(O) +--- a/testsuite/makefiles/Makefile.one ++++ b/testsuite/makefiles/Makefile.one +@@ -36,24 +36,24 @@ + + .PHONY: default + default: +- @$(MAKE) compile +- @$(NATIVECODE_ONLY) && $(BYTECODE_ONLY) \ ++ $(MAKE) compile ++ $(NATIVECODE_ONLY) && $(BYTECODE_ONLY) \ + && echo " ... testing => skipped" \ + || $(SET_LD_PATH) $(MAKE) run + + .PHONY: compile + compile: $(ML_FILES) +- @for file in $(C_FILES); do \ ++ for file in $(C_FILES); do \ + $(OCAMLC) -c $(C_INCLUDES) $$file.c; \ + done +- @if $(NATIVECODE_ONLY); then : ; else \ ++ if $(NATIVECODE_ONLY); then : ; else \ + rm -f program.byte program.byte.exe; \ + $(MAKE) $(CMO_FILES) $(MAIN_MODULE).cmo; \ + $(OCAMLC) $(ADD_COMPFLAGS) $(ADD_CFLAGS) -o program.byte$(EXE) \ + $(O_FILES) $(CMA_FILES) $(CMO_FILES) $(ADD_CMO_FILES) \ + $(MAIN_MODULE).cmo; \ + fi +- @if $(BYTECODE_ONLY); then : ; else \ ++ if $(BYTECODE_ONLY); then : ; else \ + rm -f program.native program.native.exe; \ + $(MAKE) $(CMX_FILES) $(MAIN_MODULE).cmx; \ + $(OCAMLOPT) $(ADD_COMPFLAGS) $(ADD_OPTCOMPFLAGS) \ +@@ -64,8 +64,8 @@ + + .PHONY: run + run: +- @printf " ... testing with" +- @if $(NATIVECODE_ONLY); then : ; else \ ++ printf " ... testing with" ++ if $(NATIVECODE_ONLY); then : ; else \ + printf " ocamlc"; \ + $(MYRUNTIME) ./program.byte$(EXE) $(EXEC_ARGS) \ + >$(MAIN_MODULE).result \ +@@ -78,7 +78,7 @@ + && $(DIFF) $(MAIN_MODULE).reference $(MAIN_MODULE).result \ + >/dev/null; \ + fi \ +- && echo " => passed" || echo " => failed" ++ && echo " =>" "passed" || echo " =>" "failed" + + + .PHONY: promote diff --git a/debian/patches/series b/debian/patches/series index a7ef777..4fe352c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -5,3 +5,4 @@ 0005-Avoid-multiple-declarations-in-generated-.c-files-in.patch 0006-Embed-bytecode-in-C-object-when-using-custom.patch 0008-Native-backtraces-don-t-work-on-powerpc-and-sparc.patch +more-test-debugging-info.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ocaml-maint/packages/ocaml.git _______________________________________________ Pkg-ocaml-maint-commits mailing list Pkg-ocaml-maint-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-ocaml-maint-commits