[Pkg-ocaml-maint-commits] [ocaml] 01/01: Skip native tests on bytecode-only systems

[Ximin Luo]

This is an automated email from the git hooks/post-receive script.

infinity0 pushed a commit to branch _experimental_disable-tests
in repository ocaml.

commit 47b3299a11fde201a6c1c33817a343549daa5cbc
Author: Ximin Luo <infinity0 at debian.org>
Date:   Fri Oct 28 01:43:39 2016 +0200

    Skip native tests on bytecode-only systems
---
 debian/patches/0009-Skip-native-tests.patch | 31 +++++++++++++++++++++++++++++
 debian/patches/series                       |  1 +
 2 files changed, 32 insertions(+)

diff --git a/debian/patches/0009-Skip-native-tests.patch b/debian/patches/0009-Skip-native-tests.patch
new file mode 100644
index 0000000..729fd0f
--- /dev/null
+++ b/debian/patches/0009-Skip-native-tests.patch
@@ -0,0 +1,31 @@
+--- a/testsuite/tests/lib-dynlink-csharp/Makefile
++++ b/testsuite/tests/lib-dynlink-csharp/Makefile
+@@ -29,8 +29,10 @@
+ .PHONY: prepare
+ prepare:
+ 	@if $(SUPPORTS_SHARED_LIBRARIES); then \
+-	   $(OCAMLC) -c plugin.ml && \
+-	   $(OCAMLOPT) -o plugin.cmxs -shared plugin.ml; \
++	   $(OCAMLC) -c 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