X-Git-Url: http://git.annexia.org/?a=blobdiff_plain;f=ocaml%2FMakefile.am;h=6d7ed091a213a040d6fc2b14f72b1abe2a5c1ebe;hb=70d65ae9694fa601bfec23e68f07bd9c1e180ad0;hp=21177e09722110563e73fe4c66f5396840c3e3dc;hpb=f6c4026f85fa6ded33a51ec2757abda9f116fd5f;p=libguestfs.git

diff --git a/ocaml/Makefile.am b/ocaml/Makefile.am
index 21177e0..6d7ed09 100644
--- a/ocaml/Makefile.am
+++ b/ocaml/Makefile.am
@@ -59,17 +59,22 @@ guestfs_c_actions.o: guestfs_c_actions.c
 TESTS_ENVIRONMENT = \
 	LD_LIBRARY_PATH=$(top_builddir)/src/.libs \
 	LIBGUESTFS_PATH=$(top_builddir)/appliance \
+	TMPDIR=$(top_builddir) \
 	$(VG)
 
 TESTS = run-bindtests \
-	t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate \
-	t/guestfs_060_readdir t/guestfs_070_threads \
+	t/guestfs_005_load \
+	t/guestfs_010_basic \
+	t/guestfs_070_threads \
 	t/guestfs_080_optargs \
+	t/guestfs_400_events \
 	t/guestfs_400_progress
 noinst_DATA += bindtests \
-	t/guestfs_005_load t/guestfs_010_launch t/guestfs_050_lvcreate \
-	t/guestfs_060_readdir t/guestfs_070_threads \
+	t/guestfs_005_load \
+	t/guestfs_010_basic \
+	t/guestfs_070_threads \
 	t/guestfs_080_optargs \
+	t/guestfs_400_events \
 	t/guestfs_400_progress
 
 bindtests: bindtests.cmx mlguestfs.cmxa
@@ -80,15 +85,7 @@ t/guestfs_005_load: t/guestfs_005_load.cmx mlguestfs.cmxa
 	mkdir -p t
 	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
 
-t/guestfs_010_launch: t/guestfs_010_launch.cmx mlguestfs.cmxa
-	mkdir -p t
-	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
-
-t/guestfs_050_lvcreate: t/guestfs_050_lvcreate.cmx mlguestfs.cmxa
-	mkdir -p t
-	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
-
-t/guestfs_060_readdir: t/guestfs_060_readdir.cmx mlguestfs.cmxa
+t/guestfs_010_basic: t/guestfs_010_basic.cmx mlguestfs.cmxa
 	mkdir -p t
 	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
 
@@ -100,6 +97,10 @@ t/guestfs_080_optargs: t/guestfs_080_optargs.cmx mlguestfs.cmxa
 	mkdir -p t
 	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
 
+t/guestfs_400_events: t/guestfs_400_events.cmx mlguestfs.cmxa
+	mkdir -p t
+	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@
+
 t/guestfs_400_progress: t/guestfs_400_progress.cmx mlguestfs.cmxa
 	mkdir -p t
 	$(OCAMLFIND) ocamlopt -cclib -L$(top_builddir)/src/.libs -I . -package unix -linkpkg mlguestfs.cmxa $< -o $@