This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository ocaml.
commit 5113cabf4a0da53214f3c9c7ddeffccdded83c18
Author: Ximin Luo <infini...@debian.org>
Date: Fri Oct 28 02:11:59 2016 +0200
Skip native tests on bytecode-only systems
---
debian/changelog | 1 +
debian/patches/0009-Skip-native-tests.patch | 29 +++++++++++++++++++++++++++++
debian/patches/series | 1 +
3 files changed, 31 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 2dd76d0..55608ba 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
ocaml (4.03.0-2) UNRELEASED; urgency=medium
* Add native compilers for ppc64, ppc64el, s390x.
+ * Skip native tests on bytecode-only systems.
-- Ximin Luo <infini...@debian.org> Fri, 28 Oct 2016 00:08:02 +0200
diff --git a/debian/patches/0009-Skip-native-tests.patch
b/debian/patches/0009-Skip-native-tests.patch
new file mode 100644
index 0000000..a265799
--- /dev/null
+++ b/debian/patches/0009-Skip-native-tests.patch
@@ -0,0 +1,29 @@
+--- a/testsuite/tests/lib-dynlink-csharp/Makefile
++++ b/testsuite/tests/lib-dynlink-csharp/Makefile
+@@ -30,7 +30,9 @@
+ prepare:
+ @if $(SUPPORTS_SHARED_LIBRARIES); then \
+ $(OCAMLC) -c plugin.ml && \
+- $(OCAMLOPT) -o plugin.cmxs -shared plugin.ml; \
++ if $(BYTECODE_ONLY) ; then : ; else \
++ $(OCAMLOPT) -o plugin.cmxs -shared plugin.ml; \
++ fi; \
+ fi
+
+ .PHONY: bytecode
+--- a/testsuite/tests/link-test/Makefile
++++ b/testsuite/tests/link-test/Makefile
+@@ -15,6 +15,13 @@
+ #**************************************************************************
+
+ default:
++ @if $(BYTECODE_ONLY) ; then \
++ echo " ... testing 'test.reference': => skipped"; \
++ else \
++ $(MAKE) native; \
++ fi
++
++native:
+ printf " ... testing 'test.reference':"
+ @$(OCAMLOPT) -c submodule.ml
+ @$(OCAMLOPT) -c aliases.ml
diff --git a/debian/patches/series b/debian/patches/series
index a7ef777..2f5b2f1 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
+0009-Skip-native-tests.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
