This is an automated email from the git hooks/post-receive script.
glondu pushed a commit to branch experimental/master
in repository ocaml.
commit ed651dd403ce3c68b340cdcfa3e46719712acbff
Author: Stephane Glondu <st...@glondu.net>
Date: Mon Oct 21 15:53:53 2013 +0200
More tests need upstream behaviour of -custom
---
...ed-bytecode-in-C-object-when-using-custom.patch | 66 ++++++++++++++++++--
1 file changed, 62 insertions(+), 4 deletions(-)
diff --git
a/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch
b/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch
index d8366b6..ac8ce15 100644
--- a/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch
+++ b/debian/patches/0008-Embed-bytecode-in-C-object-when-using-custom.patch
@@ -12,10 +12,14 @@ Bug-Debian:
http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627761
Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=678577
Signed-off-by: Stephane Glondu <st...@glondu.net>
---
- bytecomp/bytelink.ml | 42 ++++++++++++++++++++++++++++++++----
- testsuite/tests/embedded/Makefile | 4 ++++
- testsuite/tests/lib-marshal/Makefile | 3 +++
- 3 files changed, 45 insertions(+), 4 deletions(-)
+ bytecomp/bytelink.ml | 42 ++++++++++++++++++++++++---
+ testsuite/tests/basic-manyargs/Makefile | 3 ++
+ testsuite/tests/callback/Makefile | 3 ++
+ testsuite/tests/embedded/Makefile | 4 +++
+ testsuite/tests/gc-roots/Makefile | 3 ++
+ testsuite/tests/lib-dynlink-bytecode/Makefile | 3 ++
+ testsuite/tests/lib-marshal/Makefile | 3 ++
+ 7 files changed, 57 insertions(+), 4 deletions(-)
diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
index 87a58ab..72678fa 100644
@@ -104,6 +108,33 @@ index 87a58ab..72678fa 100644
if not (Filename.check_suffix output_name ".c") then begin
temps := c_file :: !temps;
if Ccomp.compile_file c_file <> 0 then raise(Error Custom_runtime);
+diff --git a/testsuite/tests/basic-manyargs/Makefile
b/testsuite/tests/basic-manyargs/Makefile
+index 3cf4a15..d1ad48c 100644
+--- a/testsuite/tests/basic-manyargs/Makefile
++++ b/testsuite/tests/basic-manyargs/Makefile
+@@ -15,5 +15,8 @@ BASEDIR=../..
+ MAIN_MODULE=manyargs
+ C_FILES=manyargsprim
+
++# This test relies on the upstream behaviour of -custom
++export OCAML_CUSTOM_EMBED=n
++
+ include $(BASEDIR)/makefiles/Makefile.one
+ include $(BASEDIR)/makefiles/Makefile.common
+diff --git a/testsuite/tests/callback/Makefile
b/testsuite/tests/callback/Makefile
+index 26d02ea..2069815 100644
+--- a/testsuite/tests/callback/Makefile
++++ b/testsuite/tests/callback/Makefile
+@@ -16,6 +16,9 @@ CC=$(NATIVECC) -I $(CTOPDIR)/byterun
+ COMPFLAGS=-I $(OTOPDIR)/otherlibs/unix
+ LD_PATH=$(TOPDIR)/otherlibs/unix
+
++# This test relies on the upstream behaviour of -custom
++export OCAML_CUSTOM_EMBED=n
++
+ .PHONY: default
+ default:
+ @case " $(OTHERLIBRARIES) " in \
diff --git a/testsuite/tests/embedded/Makefile
b/testsuite/tests/embedded/Makefile
index 2a01c20..dfd999c 100644
--- a/testsuite/tests/embedded/Makefile
@@ -119,6 +150,33 @@ index 2a01c20..dfd999c 100644
default: compile run
.PHONY: compile
+diff --git a/testsuite/tests/gc-roots/Makefile
b/testsuite/tests/gc-roots/Makefile
+index a108953..9c1ff43 100644
+--- a/testsuite/tests/gc-roots/Makefile
++++ b/testsuite/tests/gc-roots/Makefile
+@@ -16,5 +16,8 @@ MAIN_MODULE=globroots
+ C_FILES=globrootsprim
+ ADD_COMPFLAGS=-w a
+
++# This test relies on the upstream behaviour of -custom
++export OCAML_CUSTOM_EMBED=n
++
+ include $(BASEDIR)/makefiles/Makefile.one
+ include $(BASEDIR)/makefiles/Makefile.common
+diff --git a/testsuite/tests/lib-dynlink-bytecode/Makefile
b/testsuite/tests/lib-dynlink-bytecode/Makefile
+index 74f27b9..14cb816 100644
+--- a/testsuite/tests/lib-dynlink-bytecode/Makefile
++++ b/testsuite/tests/lib-dynlink-bytecode/Makefile
+@@ -15,6 +15,9 @@ BASEDIR=../..
+ COMPFLAGS=-I $(OTOPDIR)/otherlibs/dynlink
+ LD_PATH=.:$(TOPDIR)/otherlibs/dynlink
+
++# This test relies on the upstream behaviour of -custom
++export OCAML_CUSTOM_EMBED=n
++
+ .PHONY: default
+ default:
+ @$(SET_LD_PATH) $(MAKE) compile run
diff --git a/testsuite/tests/lib-marshal/Makefile
b/testsuite/tests/lib-marshal/Makefile
index 34b67dc..e8928e6 100644
--- a/testsuite/tests/lib-marshal/Makefile
--
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
