[Pkg-ocaml-maint-commits] [SCM] ocaml-extunix packaging branch, master, updated. debian/0.0.3-1-4-g5bd704c

[Stephane Glondu]

The following commit has been merged in the master branch:
commit eeb25bf863759744249fbb9dbb92340837688c65
Author: Stephane Glondu <steph at glondu.net>
Date:   Thu Aug 25 09:20:31 2011 +0200

    Disable execinfo test on arm and powerpc

diff --git a/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch b/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch
new file mode 100644
index 0000000..cbd85c9
--- /dev/null
+++ b/debian/patches/0001-Add-possibility-to-disable-execinfo-test-through-env.patch
@@ -0,0 +1,45 @@
+From: Stephane Glondu <steph at glondu.net>
+Date: Thu, 25 Aug 2011 09:14:40 +0200
+Subject: Add possibility to disable execinfo test through environment
+
+It fails on armel because of [1] and on powerpc because of [2].
+
+[1] http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=637360
+[2] http://caml.inria.fr/mantis/view.php?id=5334
+
+Forwarded: not-needed
+Signed-off-by: Stephane Glondu <steph at glondu.net>
+---
+ test/test.ml |    9 ++++++---
+ 1 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/test/test.ml b/test/test.ml
+index 2501bab..840d4b5 100644
+--- a/test/test.ml
++++ b/test/test.ml
+@@ -228,7 +228,7 @@ let () =
+   let wrap test =
+     with_unix_error (fun () -> test (); Gc.compact ())
+   in
+-  let tests = ("tests" >::: [
++  let tests = ("tests" >::: ([
+     "eventfd" >:: test_eventfd;
+     "uname" >:: test_uname;
+     "fadvise" >:: test_fadvise;
+@@ -239,10 +239,13 @@ let () =
+     "resource" >::: test_resource;
+     "strtime" >:: test_strtime;
+     "pts" >:: test_pts;
+-    "execinfo" >:: test_execinfo;
++  ] @ (
++    try let _ = Sys.getenv "DISABLE_EXECINFO" in []
++    with Not_found -> ["execinfo" >:: test_execinfo]
++  ) @ [
+     "statvfs" >:: test_statvfs;
+     "setenv" >:: test_setenv;
+     "mkdtemp" >:: test_mkdtemp;
+-  ]) in
++  ])) in
+   ignore (run_test_tt_main (test_decorate wrap tests))
+ 
+-- 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..9d3591a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Add-possibility-to-disable-execinfo-test-through-env.patch
diff --git a/debian/rules b/debian/rules
index fd8c318..88f26c8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,6 +13,10 @@ export OCAMLFIND_DESTDIR
 OCAMLFIND_LDCONF=ignore
 export OCAMLFIND_LDCONF
 
+ifneq (,$(findstring $(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),arm powerpc))
+   export DISABLE_EXECINFO=1
+endif
+
 %:
 	dh --with ocaml $@
 

-- 
ocaml-extunix packaging