Fix embedded test broken by our -custom behaviour
authorStephane Glondu <steph@glondu.net>
Tue, 27 Mar 2012 13:35:17 +0000 (15:35 +0200)
committerStephane Glondu <steph@glondu.net>
Thu, 19 Apr 2012 06:33:42 +0000 (08:33 +0200)
debian/patches/0011-Embed-bytecode-in-C-object-when-using-custom.patch

index c062dcfeda17c9b6208040096f074dabe98fd93e..aedb4436edd7a842a7163d561c2cc1617ac11073 100644 (file)
@@ -11,8 +11,9 @@ Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=256900
 Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=627761
 Signed-off-by: Stephane Glondu <steph@glondu.net>
 ---
- bytecomp/bytelink.ml |   36 ++++++++++++++++++++++++++++++++----
- 1 files changed, 32 insertions(+), 4 deletions(-)
+ bytecomp/bytelink.ml              |   36 ++++++++++++++++++++++++++++++++----
+ testsuite/tests/embedded/Makefile |    3 +++
+ 2 files changed, 35 insertions(+), 4 deletions(-)
 
 diff --git a/bytecomp/bytelink.ml b/bytecomp/bytelink.ml
 index 8f797a1..1de0a79 100644
@@ -95,4 +96,17 @@ index 8f797a1..1de0a79 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/embedded/Makefile b/testsuite/tests/embedded/Makefile
+index ed33143..0d1e4ca 100644
+--- a/testsuite/tests/embedded/Makefile
++++ b/testsuite/tests/embedded/Makefile
+@@ -1,5 +1,8 @@
+ BASEDIR=../..
++# This test relies on the upstream behaviour of -custom
++export OCAML_COMPAT=c
++
+ default: compile run
+ compile:
 --