diff options
| author | Richard W.M. Jones <rjones@redhat.com> | 2012-07-18 13:45:21 +0100 |
|---|---|---|
| committer | Richard W.M. Jones <rjones@redhat.com> | 2012-08-05 21:28:14 +0100 |
| commit | d37e8dd2a7ef5732f9d30dee04ab26c5adbf483d (patch) | |
| tree | 75cb890cd9552c94a3f1949552acec596dd2b84d /ocaml/Makefile.am | |
| parent | af0051927ebf30f76e20741999c0ce19b988f35e (diff) | |
| download | libguestfs-d37e8dd2a7ef5732f9d30dee04ab26c5adbf483d.tar.gz libguestfs-d37e8dd2a7ef5732f9d30dee04ab26c5adbf483d.tar.xz libguestfs-d37e8dd2a7ef5732f9d30dee04ab26c5adbf483d.zip | |
ocaml: Test mount-local, without parallel test.
Unfortunately the parallel test keeps hitting this bug:
https://bugzilla.redhat.com/show_bug.cgi?id=838081
which could be a bug in the OCaml runtime.
Just test simple mount-local. We will write a parallel test in C to
replace this.
(cherry picked from commit eef11f33f9f14d3706b681bd4e23e334fcc9b791)
Diffstat (limited to 'ocaml/Makefile.am')
| -rw-r--r-- | ocaml/Makefile.am | 21 |
1 files changed, 5 insertions, 16 deletions
diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am index f22f3f4c..f53194a0 100644 --- a/ocaml/Makefile.am +++ b/ocaml/Makefile.am @@ -36,7 +36,6 @@ EXTRA_DIST = \ html/.gitignore \ META.in \ run-bindtests \ - t/exit.c \ t/*.ml CLEANFILES = *.cmi *.cmo *.cmx *.cma *.cmxa *.o *.a *.so @@ -95,7 +94,7 @@ test_progs += \ t/guestfs_010_basic \ t/guestfs_070_threads \ t/guestfs_400_progress \ - t/guestfs_500_parallel_mount_local + t/guestfs_500_mount_local endif TESTS = run-bindtests \ @@ -171,14 +170,14 @@ t/guestfs_400_progress.opt: t/guestfs_400_progress.cmx mlguestfs.cmxa mkdir -p t $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ -t/guestfs_500_parallel_mount_local.bc: t/guestfs_500_parallel_mount_local.cmo mlguestfs.cma libocamltestlib.a +t/guestfs_500_mount_local.bc: t/guestfs_500_mount_local.cmo mlguestfs.cma mkdir -p t LD_LIBRARY_PATH=../src/.libs \ - $(OCAMLFIND) ocamlc -custom $(OCAMLCFLAGS) -I . -package unix,threads -thread -linkpkg mlguestfs.cma libocamltestlib.a $< -o $@ + $(OCAMLFIND) ocamlc -custom $(OCAMLCFLAGS) -I . -package unix -linkpkg mlguestfs.cma $< -o $@ -t/guestfs_500_parallel_mount_local.opt: t/guestfs_500_parallel_mount_local.cmx mlguestfs.cmxa libocamltestlib.a +t/guestfs_500_mount_local.opt: t/guestfs_500_mount_local.cmx mlguestfs.cmxa mkdir -p t - $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix,threads -thread -linkpkg mlguestfs.cmxa libocamltestlib.a $< -o $@ + $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@ # Explicit rules for these tests which require 'threads' package. t/guestfs_070_threads.cmo: t/guestfs_070_threads.ml mlguestfs.cma @@ -187,16 +186,6 @@ t/guestfs_070_threads.cmo: t/guestfs_070_threads.ml mlguestfs.cma t/guestfs_070_threads.cmx: t/guestfs_070_threads.ml mlguestfs.cmxa $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix,threads -thread -linkpkg -c $< -o $@ -t/guestfs_500_parallel_mount_local.cmo: t/guestfs_500_parallel_mount_local.ml mlguestfs.cma - $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix,threads -thread -linkpkg -c $< -o $@ - -t/guestfs_500_parallel_mount_local.cmx: t/guestfs_500_parallel_mount_local.ml mlguestfs.cmxa - $(OCAMLFIND) ocamlopt $(OCAMLOPTFLAGS) -package unix,threads -thread -linkpkg -c $< -o $@ - -noinst_LIBRARIES += libocamltestlib.a -libocamltestlib_a_SOURCES = t/exit.c -libocamltestlib_a_CFLAGS = $(libguestfsocaml_a_CFLAGS) - %.cmi: %.mli $(OCAMLFIND) ocamlc $(OCAMLCFLAGS) -package unix -c $< -o $(builddir)/$@ %.cmo: %.ml mlguestfs.cma |