xapi-project · mseri · Feb 27, 2018 · Feb 23, 2018 · Feb 23, 2018 · Feb 23, 2018
diff --git a/Makefile b/Makefile
@@ -40,7 +40,7 @@ install: build doc
 # ocaml/xapi
 	make -C scripts install
 	cp -f _build/install/default/bin/xapi $(DESTDIR)$(SBINDIR)/xapi
-	scripts/install.sh 755 ocaml/xapi/quicktest $(DESTDIR)$(OPTDIR)/debug
+	scripts/install.sh 755 ocaml/quicktest/quicktest $(DESTDIR)$(OPTDIR)/debug
 	cp -f _build/install/default/bin/quicktestbin $(DESTDIR)$(OPTDIR)/debug/quicktestbin
 	scripts/install.sh 644 _build/install/default/share/xapi/rbac_static.csv $(DESTDIR)$(OPTDIR)/debug
 # ocaml/xsh

diff --git a/ocaml/perftest/xmlrpcserver.ml b/ocaml/perftest/xmlrpcserver.ml
diff --git a/ocaml/quicktest/jbuild b/ocaml/quicktest/jbuild
@@ -0,0 +1,38 @@
+(* -*- tuareg -*- *)
+#require "unix"
+
+let flags = function
+| [] -> ""
+| pkgs ->
+  let cmd = "ocamlfind ocamlc -verbose" ^ (
+    List.fold_left (fun acc pkg -> acc ^ " -package " ^ pkg) "" pkgs
+  ) in
+  let ic = Unix.open_process_in
+    (cmd ^ " | grep -oEe '-ppx (\"([^\"\\]|\\.)+\"|\\w+)'")
+  in
+  let rec go ic acc =
+    try go ic (acc ^ " " ^ input_line ic) with End_of_file -> close_in ic; acc
+  in
+  go ic ""
+
+let rewriters = ["ppx_deriving_rpc"; "ppx_sexp_conv"]
+
+let coverage_rewriter =
+  let is_coverage = try Unix.getenv "BISECT_ENABLE" = "YES" with Not_found -> false in
+  if is_coverage then
+    "(preprocess (pps (bisect_ppx -conditional)))"
+  else
+    ""
+
+let () = Printf.ksprintf Jbuild_plugin.V1.send {|
+
+(executable
+ ((name quicktest)
+  (public_name quicktestbin)
+  (package xapi)
+  (flags (:standard -bin-annot %s -warn-error +a-3-4-6-9-27-28-29-52))
+  (libraries (
+   xapi_internal
+  ))
+))
+|} (flags rewriters)
diff --git a/ocaml/xapi/ocamltest.ml → ocaml/quicktest/ocamltest.ml b/ocaml/xapi/ocamltest.ml → ocaml/quicktest/ocamltest.ml
diff --git a/ocaml/xapi/ocamltest.mli → ocaml/quicktest/ocamltest.mli b/ocaml/xapi/ocamltest.mli → ocaml/quicktest/ocamltest.mli
diff --git a/ocaml/xapi/quicktest → ocaml/quicktest/quicktest b/ocaml/xapi/quicktest → ocaml/quicktest/quicktest
diff --git a/ocaml/xapi/quicktest.ml → ocaml/quicktest/quicktest.ml b/ocaml/xapi/quicktest.ml → ocaml/quicktest/quicktest.ml
diff --git a/ocaml/xapi/quicktest_bvt.ml → ocaml/quicktest/quicktest_bvt.ml b/ocaml/xapi/quicktest_bvt.ml → ocaml/quicktest/quicktest_bvt.ml
diff --git a/ocaml/xapi/quicktest_cbt.ml → ocaml/quicktest/quicktest_cbt.ml b/ocaml/xapi/quicktest_cbt.ml → ocaml/quicktest/quicktest_cbt.ml
diff --git a/ocaml/xapi/quicktest_common.ml → ocaml/quicktest/quicktest_common.ml b/ocaml/xapi/quicktest_common.ml → ocaml/quicktest/quicktest_common.ml
diff --git a/ocaml/xapi/quicktest_encodings.ml → ocaml/quicktest/quicktest_encodings.ml b/ocaml/xapi/quicktest_encodings.ml → ocaml/quicktest/quicktest_encodings.ml
diff --git a/ocaml/xapi/quicktest_http.ml → ocaml/quicktest/quicktest_http.ml b/ocaml/xapi/quicktest_http.ml → ocaml/quicktest/quicktest_http.ml
diff --git a/ocaml/xapi/quicktest_import_raw_vdi.ml → ocaml/quicktest/quicktest_import_raw_vdi.ml b/ocaml/xapi/quicktest_import_raw_vdi.ml → ocaml/quicktest/quicktest_import_raw_vdi.ml
diff --git a/ocaml/xapi/quicktest_lifecycle.ml → ocaml/quicktest/quicktest_lifecycle.ml b/ocaml/xapi/quicktest_lifecycle.ml → ocaml/quicktest/quicktest_lifecycle.ml
diff --git a/ocaml/xapi/quicktest_ocamltest.ml → ocaml/quicktest/quicktest_ocamltest.ml b/ocaml/xapi/quicktest_ocamltest.ml → ocaml/quicktest/quicktest_ocamltest.ml
diff --git a/ocaml/xapi/quicktest_ocamltest.mli → ocaml/quicktest/quicktest_ocamltest.mli b/ocaml/xapi/quicktest_ocamltest.mli → ocaml/quicktest/quicktest_ocamltest.mli
diff --git a/ocaml/xapi/quicktest_storage.ml → ocaml/quicktest/quicktest_storage.ml b/ocaml/xapi/quicktest_storage.ml → ocaml/quicktest/quicktest_storage.ml
diff --git a/ocaml/xapi/quicktest_vdi_copy.ml → ocaml/quicktest/quicktest_vdi_copy.ml b/ocaml/xapi/quicktest_vdi_copy.ml → ocaml/quicktest/quicktest_vdi_copy.ml
diff --git a/...l/xapi/quicktest_vm_memory_constraints.ml → ...cktest/quicktest_vm_memory_constraints.ml b/...l/xapi/quicktest_vm_memory_constraints.ml → ...cktest/quicktest_vm_memory_constraints.ml
diff --git a/ocaml/xapi/quicktest_vm_placement.ml → ocaml/quicktest/quicktest_vm_placement.ml b/ocaml/xapi/quicktest_vm_placement.ml → ocaml/quicktest/quicktest_vm_placement.ml
diff --git a/ocaml/xapi/alcotest_comparators.ml → ocaml/tests/alcotest_comparators.ml b/ocaml/xapi/alcotest_comparators.ml → ocaml/tests/alcotest_comparators.ml
diff --git a/ocaml/xapi/at_least_once_more_test.ml → ocaml/tests/at_least_once_more_test.ml b/ocaml/xapi/at_least_once_more_test.ml → ocaml/tests/at_least_once_more_test.ml
diff --git a/ocaml/xapi/binpack_test.ml → ocaml/tests/binpack_test.ml b/ocaml/xapi/binpack_test.ml → ocaml/tests/binpack_test.ml
diff --git a/ocaml/xapi/bootloader_test.ml → ocaml/tests/bootloader_test.ml b/ocaml/xapi/bootloader_test.ml → ocaml/tests/bootloader_test.ml
diff --git a/ocaml/xapi/cancel_tests.ml → ocaml/tests/cancel_tests.ml b/ocaml/xapi/cancel_tests.ml → ocaml/tests/cancel_tests.ml
diff --git a/ocaml/xapi/has_vendor_device_test.py → ocaml/tests/has_vendor_device_test.py b/ocaml/xapi/has_vendor_device_test.py → ocaml/tests/has_vendor_device_test.py
diff --git a/ocaml/xapi/http_test.ml → ocaml/tests/http_test.ml b/ocaml/xapi/http_test.ml → ocaml/tests/http_test.ml
diff --git a/ocaml/tests/jbuild b/ocaml/tests/jbuild
@@ -0,0 +1,58 @@
+(* -*- tuareg -*- *)
+#require "unix"
+
+let flags = function
+| [] -> ""
+| pkgs ->
+let cmd = "ocamlfind ocamlc -verbose" ^ (
+                                         List.fold_left (fun acc pkg -> acc ^ " -package " ^ pkg) "" pkgs
+                                         ) in
+let ic = Unix.open_process_in
+(cmd ^ " | grep -oEe '-ppx (\"([^\"\\]|\\.)+\"|\\w+)'")
+in
+let rec go ic acc =
+try go ic (acc ^ " " ^ input_line ic) with End_of_file -> close_in ic; acc
+in
+go ic ""
+
+let rewriters = ["ppx_deriving_rpc"; "ppx_sexp_conv"]
+
+let coverage_rewriter =
+let is_coverage = try Unix.getenv "BISECT_ENABLE" = "YES" with Not_found -> false in
+if is_coverage then
+"(preprocess (pps (bisect_ppx -conditional)))"
+else
+""
+
+let () = Printf.ksprintf Jbuild_plugin.V1.send {|
+
+
+(executables
+((names (suite suite_alcotest))
+(flags (:standard -bin-annot %s -warn-error +a-3-4-6-9-27-28-29-52))
+(libraries (
+            xapi_internal
+            alcotest
+            oUnit
+            stdext
+            threads
+            ))
+%s)
+)
+
+(alias
+((name runtest)
+ (package xapi)
+(deps (suite.exe (files_recursively_in test_data)))
+(action (run ${<} -runner sequential -verbose true))
+)
+)
+
+(alias
+((name runtest)
+ (package xapi)
+(deps (suite_alcotest.exe (files_recursively_in test_data)))
+(action (run ${<}))
+)
+)
+|} (flags rewriters) coverage_rewriter
diff --git a/ocaml/xapi/mock.ml → ocaml/tests/mock.ml b/ocaml/xapi/mock.ml → ocaml/tests/mock.ml
diff --git a/ocaml/xapi/mock_rpc.ml → ocaml/tests/mock_rpc.ml b/ocaml/xapi/mock_rpc.ml → ocaml/tests/mock_rpc.ml
diff --git a/ocaml/xapi/monitor_fake_plugin.ml → ocaml/tests/monitor_fake_plugin.ml b/ocaml/xapi/monitor_fake_plugin.ml → ocaml/tests/monitor_fake_plugin.ml
diff --git a/ocaml/xapi/ounit_comparators.ml → ocaml/tests/ounit_comparators.ml b/ocaml/xapi/ounit_comparators.ml → ocaml/tests/ounit_comparators.ml
diff --git a/ocaml/xapi/quicktest_test_ideas.md → ocaml/tests/quicktest_test_ideas.md b/ocaml/xapi/quicktest_test_ideas.md → ocaml/tests/quicktest_test_ideas.md
diff --git a/ocaml/xapi/storage_impl_test.ml → ocaml/tests/storage_impl_test.ml b/ocaml/xapi/storage_impl_test.ml → ocaml/tests/storage_impl_test.ml
diff --git a/ocaml/xapi/suite.ml → ocaml/tests/suite.ml b/ocaml/xapi/suite.ml → ocaml/tests/suite.ml
diff --git a/ocaml/xapi/suite_alcotest.ml → ocaml/tests/suite_alcotest.ml b/ocaml/xapi/suite_alcotest.ml → ocaml/tests/suite_alcotest.ml
diff --git a/ocaml/xapi/suite_init.ml → ocaml/tests/suite_init.ml b/ocaml/xapi/suite_init.ml → ocaml/tests/suite_init.ml
diff --git a/ocaml/xapi/test_agility.ml → ocaml/tests/test_agility.ml b/ocaml/xapi/test_agility.ml → ocaml/tests/test_agility.ml
diff --git a/ocaml/xapi/test_basic.ml → ocaml/tests/test_basic.ml b/ocaml/xapi/test_basic.ml → ocaml/tests/test_basic.ml
diff --git a/ocaml/xapi/test_ca121350.ml → ocaml/tests/test_ca121350.ml b/ocaml/xapi/test_ca121350.ml → ocaml/tests/test_ca121350.ml
diff --git a/ocaml/xapi/test_ca91480.ml → ocaml/tests/test_ca91480.ml b/ocaml/xapi/test_ca91480.ml → ocaml/tests/test_ca91480.ml
diff --git a/ocaml/xapi/test_common.ml → ocaml/tests/test_common.ml b/ocaml/xapi/test_common.ml → ocaml/tests/test_common.ml
diff --git a/ocaml/xapi/test_cpuid_helpers.ml → ocaml/tests/test_cpuid_helpers.ml b/ocaml/xapi/test_cpuid_helpers.ml → ocaml/tests/test_cpuid_helpers.ml
diff --git a/ocaml/xapi/test_daemon_manager.ml → ocaml/tests/test_daemon_manager.ml b/ocaml/xapi/test_daemon_manager.ml → ocaml/tests/test_daemon_manager.ml
diff --git a/ocaml/xapi/test_data/gvt-g-whitelist-1234 → ocaml/tests/test_data/gvt-g-whitelist-1234 b/ocaml/xapi/test_data/gvt-g-whitelist-1234 → ocaml/tests/test_data/gvt-g-whitelist-1234
diff --git a/ocaml/xapi/test_data/gvt-g-whitelist-empty → ocaml/tests/test_data/gvt-g-whitelist-empty b/ocaml/xapi/test_data/gvt-g-whitelist-empty → ocaml/tests/test_data/gvt-g-whitelist-empty
diff --git a/ocaml/xapi/test_data/gvt-g-whitelist-mixed → ocaml/tests/test_data/gvt-g-whitelist-mixed b/ocaml/xapi/test_data/gvt-g-whitelist-mixed → ocaml/tests/test_data/gvt-g-whitelist-mixed
diff --git a/ocaml/xapi/test_data/mxgpu-whitelist-1234 → ocaml/tests/test_data/mxgpu-whitelist-1234 b/ocaml/xapi/test_data/mxgpu-whitelist-1234 → ocaml/tests/test_data/mxgpu-whitelist-1234
diff --git a/ocaml/xapi/test_data/mxgpu-whitelist-empty → ocaml/tests/test_data/mxgpu-whitelist-empty b/ocaml/xapi/test_data/mxgpu-whitelist-empty → ocaml/tests/test_data/mxgpu-whitelist-empty
diff --git a/ocaml/xapi/test_data/mxgpu-whitelist-mixed → ocaml/tests/test_data/mxgpu-whitelist-mixed b/ocaml/xapi/test_data/mxgpu-whitelist-mixed → ocaml/tests/test_data/mxgpu-whitelist-mixed
diff --git a/ocaml/xapi/test_data/nvidia-whitelist.xml → ocaml/tests/test_data/nvidia-whitelist.xml b/ocaml/xapi/test_data/nvidia-whitelist.xml → ocaml/tests/test_data/nvidia-whitelist.xml
diff --git a/.../xapi/test_data/test_vgpu_nosubdevid.conf → ...tests/test_data/test_vgpu_nosubdevid.conf b/.../xapi/test_data/test_vgpu_nosubdevid.conf → ...tests/test_data/test_vgpu_nosubdevid.conf
diff --git a/ocaml/xapi/test_data/test_vgpu_subdevid.conf → ...l/tests/test_data/test_vgpu_subdevid.conf b/ocaml/xapi/test_data/test_vgpu_subdevid.conf → ...l/tests/test_data/test_vgpu_subdevid.conf
diff --git a/ocaml/xapi/test_datamodel_utils.ml → ocaml/tests/test_datamodel_utils.ml b/ocaml/xapi/test_datamodel_utils.ml → ocaml/tests/test_datamodel_utils.ml
diff --git a/ocaml/xapi/test_db_lowlevel.ml → ocaml/tests/test_db_lowlevel.ml b/ocaml/xapi/test_db_lowlevel.ml → ocaml/tests/test_db_lowlevel.ml
diff --git a/ocaml/xapi/test_dbsync_master.ml → ocaml/tests/test_dbsync_master.ml b/ocaml/xapi/test_dbsync_master.ml → ocaml/tests/test_dbsync_master.ml
diff --git a/ocaml/xapi/test_event.ml → ocaml/tests/test_event.ml b/ocaml/xapi/test_event.ml → ocaml/tests/test_event.ml
diff --git a/ocaml/xapi/test_event_common.ml → ocaml/tests/test_event_common.ml b/ocaml/xapi/test_event_common.ml → ocaml/tests/test_event_common.ml
diff --git a/ocaml/xapi/test_event_common.mli → ocaml/tests/test_event_common.mli b/ocaml/xapi/test_event_common.mli → ocaml/tests/test_event_common.mli
diff --git a/ocaml/xapi/test_extauth_plugin_ADpbis.ml → ocaml/tests/test_extauth_plugin_ADpbis.ml b/ocaml/xapi/test_extauth_plugin_ADpbis.ml → ocaml/tests/test_extauth_plugin_ADpbis.ml
diff --git a/ocaml/xapi/test_features.ml → ocaml/tests/test_features.ml b/ocaml/xapi/test_features.ml → ocaml/tests/test_features.ml
diff --git a/ocaml/xapi/test_gpu_group.ml → ocaml/tests/test_gpu_group.ml b/ocaml/xapi/test_gpu_group.ml → ocaml/tests/test_gpu_group.ml
diff --git a/ocaml/xapi/test_guest_agent.ml → ocaml/tests/test_guest_agent.ml b/ocaml/xapi/test_guest_agent.ml → ocaml/tests/test_guest_agent.ml
diff --git a/ocaml/xapi/test_ha_vm_failover.ml → ocaml/tests/test_ha_vm_failover.ml b/ocaml/xapi/test_ha_vm_failover.ml → ocaml/tests/test_ha_vm_failover.ml
diff --git a/ocaml/xapi/test_helpers.ml → ocaml/tests/test_helpers.ml b/ocaml/xapi/test_helpers.ml → ocaml/tests/test_helpers.ml
diff --git a/ocaml/xapi/test_host.ml → ocaml/tests/test_host.ml b/ocaml/xapi/test_host.ml → ocaml/tests/test_host.ml
diff --git a/ocaml/xapi/test_http.ml → ocaml/tests/test_http.ml b/ocaml/xapi/test_http.ml → ocaml/tests/test_http.ml
diff --git a/ocaml/xapi/test_map_check.ml → ocaml/tests/test_map_check.ml b/ocaml/xapi/test_map_check.ml → ocaml/tests/test_map_check.ml
diff --git a/ocaml/xapi/test_network.ml → ocaml/tests/test_network.ml b/ocaml/xapi/test_network.ml → ocaml/tests/test_network.ml
diff --git a/ocaml/xapi/test_network_event_loop.ml → ocaml/tests/test_network_event_loop.ml b/ocaml/xapi/test_network_event_loop.ml → ocaml/tests/test_network_event_loop.ml
diff --git a/ocaml/xapi/test_no_migrate.ml → ocaml/tests/test_no_migrate.ml b/ocaml/xapi/test_no_migrate.ml → ocaml/tests/test_no_migrate.ml
diff --git a/ocaml/xapi/test_pci_helpers.ml → ocaml/tests/test_pci_helpers.ml b/ocaml/xapi/test_pci_helpers.ml → ocaml/tests/test_pci_helpers.ml
diff --git a/ocaml/xapi/test_pgpu.ml → ocaml/tests/test_pgpu.ml b/ocaml/xapi/test_pgpu.ml → ocaml/tests/test_pgpu.ml
diff --git a/ocaml/xapi/test_pgpu_helpers.ml → ocaml/tests/test_pgpu_helpers.ml b/ocaml/xapi/test_pgpu_helpers.ml → ocaml/tests/test_pgpu_helpers.ml
diff --git a/ocaml/xapi/test_platformdata.ml → ocaml/tests/test_platformdata.ml b/ocaml/xapi/test_platformdata.ml → ocaml/tests/test_platformdata.ml
diff --git a/ocaml/xapi/test_pool_apply_edition.ml → ocaml/tests/test_pool_apply_edition.ml b/ocaml/xapi/test_pool_apply_edition.ml → ocaml/tests/test_pool_apply_edition.ml
diff --git a/ocaml/xapi/test_pool_cpuinfo.ml → ocaml/tests/test_pool_cpuinfo.ml b/ocaml/xapi/test_pool_cpuinfo.ml → ocaml/tests/test_pool_cpuinfo.ml
diff --git a/ocaml/xapi/test_pool_db_backup.ml → ocaml/tests/test_pool_db_backup.ml b/ocaml/xapi/test_pool_db_backup.ml → ocaml/tests/test_pool_db_backup.ml
diff --git a/ocaml/xapi/test_pool_license.ml → ocaml/tests/test_pool_license.ml b/ocaml/xapi/test_pool_license.ml → ocaml/tests/test_pool_license.ml
diff --git a/ocaml/xapi/test_pool_restore_database.ml → ocaml/tests/test_pool_restore_database.ml b/ocaml/xapi/test_pool_restore_database.ml → ocaml/tests/test_pool_restore_database.ml
diff --git a/ocaml/xapi/test_pool_update.ml → ocaml/tests/test_pool_update.ml b/ocaml/xapi/test_pool_update.ml → ocaml/tests/test_pool_update.ml
diff --git a/ocaml/xapi/test_pr1510.ml → ocaml/tests/test_pr1510.ml b/ocaml/xapi/test_pr1510.ml → ocaml/tests/test_pr1510.ml
diff --git a/ocaml/xapi/test_pusb.ml → ocaml/tests/test_pusb.ml b/ocaml/xapi/test_pusb.ml → ocaml/tests/test_pusb.ml
diff --git a/ocaml/xapi/test_pvs_cache_storage.ml → ocaml/tests/test_pvs_cache_storage.ml b/ocaml/xapi/test_pvs_cache_storage.ml → ocaml/tests/test_pvs_cache_storage.ml
diff --git a/ocaml/xapi/test_pvs_proxy.ml → ocaml/tests/test_pvs_proxy.ml b/ocaml/xapi/test_pvs_proxy.ml → ocaml/tests/test_pvs_proxy.ml
diff --git a/ocaml/xapi/test_pvs_server.ml → ocaml/tests/test_pvs_server.ml b/ocaml/xapi/test_pvs_server.ml → ocaml/tests/test_pvs_server.ml
diff --git a/ocaml/xapi/test_pvs_site.ml → ocaml/tests/test_pvs_site.ml b/ocaml/xapi/test_pvs_site.ml → ocaml/tests/test_pvs_site.ml
diff --git a/ocaml/xapi/test_sdn_controller.ml → ocaml/tests/test_sdn_controller.ml b/ocaml/xapi/test_sdn_controller.ml → ocaml/tests/test_sdn_controller.ml
diff --git a/ocaml/xapi/test_sm_features.ml → ocaml/tests/test_sm_features.ml b/ocaml/xapi/test_sm_features.ml → ocaml/tests/test_sm_features.ml
diff --git a/ocaml/xapi/test_sr_update_vdis.ml → ocaml/tests/test_sr_update_vdis.ml b/ocaml/xapi/test_sr_update_vdis.ml → ocaml/tests/test_sr_update_vdis.ml
diff --git a/ocaml/xapi/test_state.ml → ocaml/tests/test_state.ml b/ocaml/xapi/test_state.ml → ocaml/tests/test_state.ml
diff --git a/ocaml/xapi/test_storage_migrate_state.ml → ocaml/tests/test_storage_migrate_state.ml b/ocaml/xapi/test_storage_migrate_state.ml → ocaml/tests/test_storage_migrate_state.ml
diff --git a/ocaml/xapi/test_valid_ref_list.ml → ocaml/tests/test_valid_ref_list.ml b/ocaml/xapi/test_valid_ref_list.ml → ocaml/tests/test_valid_ref_list.ml
diff --git a/ocaml/xapi/test_vdi_allowed_operations.ml → ocaml/tests/test_vdi_allowed_operations.ml b/ocaml/xapi/test_vdi_allowed_operations.ml → ocaml/tests/test_vdi_allowed_operations.ml
diff --git a/ocaml/xapi/test_vdi_cbt.ml → ocaml/tests/test_vdi_cbt.ml b/ocaml/xapi/test_vdi_cbt.ml → ocaml/tests/test_vdi_cbt.ml
diff --git a/ocaml/xapi/test_vgpu_common.ml → ocaml/tests/test_vgpu_common.ml b/ocaml/xapi/test_vgpu_common.ml → ocaml/tests/test_vgpu_common.ml
diff --git a/ocaml/xapi/test_vgpu_type.ml → ocaml/tests/test_vgpu_type.ml b/ocaml/xapi/test_vgpu_type.ml → ocaml/tests/test_vgpu_type.ml
diff --git a/ocaml/xapi/test_vlan.ml → ocaml/tests/test_vlan.ml b/ocaml/xapi/test_vlan.ml → ocaml/tests/test_vlan.ml
diff --git a/ocaml/xapi/test_vm.ml → ocaml/tests/test_vm.ml b/ocaml/xapi/test_vm.ml → ocaml/tests/test_vm.ml
diff --git a/ocaml/xapi/test_vm_check_operation_error.ml → ocaml/tests/test_vm_check_operation_error.ml b/ocaml/xapi/test_vm_check_operation_error.ml → ocaml/tests/test_vm_check_operation_error.ml
diff --git a/ocaml/xapi/test_vm_helpers.ml → ocaml/tests/test_vm_helpers.ml b/ocaml/xapi/test_vm_helpers.ml → ocaml/tests/test_vm_helpers.ml
diff --git a/ocaml/xapi/test_vm_migrate.ml → ocaml/tests/test_vm_migrate.ml b/ocaml/xapi/test_vm_migrate.ml → ocaml/tests/test_vm_migrate.ml
diff --git a/ocaml/xapi/test_workload_balancing.ml → ocaml/tests/test_workload_balancing.ml b/ocaml/xapi/test_workload_balancing.ml → ocaml/tests/test_workload_balancing.ml
diff --git a/ocaml/xapi/test_xapi_db_upgrade.ml → ocaml/tests/test_xapi_db_upgrade.ml b/ocaml/xapi/test_xapi_db_upgrade.ml → ocaml/tests/test_xapi_db_upgrade.ml
diff --git a/ocaml/xapi/test_xapi_vbd_helpers.ml → ocaml/tests/test_xapi_vbd_helpers.ml b/ocaml/xapi/test_xapi_vbd_helpers.ml → ocaml/tests/test_xapi_vbd_helpers.ml
diff --git a/ocaml/xapi/test_xapi_xenops.ml → ocaml/tests/test_xapi_xenops.ml b/ocaml/xapi/test_xapi_xenops.ml → ocaml/tests/test_xapi_xenops.ml
diff --git a/ocaml/xapi/test_xenopsd_metadata.ml → ocaml/tests/test_xenopsd_metadata.ml b/ocaml/xapi/test_xenopsd_metadata.ml → ocaml/tests/test_xenopsd_metadata.ml
diff --git a/ocaml/xapi/testauth.ml → ocaml/tests/testauth.ml b/ocaml/xapi/testauth.ml → ocaml/tests/testauth.ml
diff --git a/ocaml/xapi/testauthx.ml → ocaml/tests/testauthx.ml b/ocaml/xapi/testauthx.ml → ocaml/tests/testauthx.ml
diff --git a/ocaml/xapi/tests/NOTES → ocaml/tests/tests/NOTES b/ocaml/xapi/tests/NOTES → ocaml/tests/tests/NOTES
diff --git a/ocaml/xapi/tests/looper.py → ocaml/tests/tests/looper.py b/ocaml/xapi/tests/looper.py → ocaml/tests/tests/looper.py
diff --git a/ocaml/xapi/tests/looper2.py → ocaml/tests/tests/looper2.py b/ocaml/xapi/tests/looper2.py → ocaml/tests/tests/looper2.py
diff --git a/ocaml/xapi/jbuild b/ocaml/xapi/jbuild
@@ -67,13 +67,12 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
  )
 )
 
-(executables
- ((names (xapi_main suite suite_alcotest quicktest))
-  (public_names (xapi - - quicktestbin))
-  (package xapi)
+(library
+ ((name xapi_internal)
+  (wrapped false)
   (flags (:standard -bin-annot %s -warn-error +a-3-4-6-9-27-28-29-52))
+  (modules (:standard \ xapi_main))
   (libraries (
-   alcotest
    opasswd
    pam
    pciutil
@@ -82,7 +81,6 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
    message-switch-unix
    mtime
    mtime.clock.os
-   oUnit
    sha
    tar
    tar-unix
@@ -115,17 +113,14 @@ let () = Printf.ksprintf Jbuild_plugin.V1.send {|
   %s)
 )
 
-(alias
- ((name runtest)
-  (deps (suite.exe (files_recursively_in test_data)))
-  (action (run ${<} -runner sequential -verbose true))
- )
-)
-
-(alias
- ((name runtest)
-  (deps (suite_alcotest.exe (files_recursively_in test_data)))
-  (action (run ${<}))
- )
-)
-|} (flags rewriters) coverage_rewriter
+(executable
+ ((name xapi_main)
+  (public_name xapi)
+  (package xapi)
+  (modules (xapi_main))
+  (flags (:standard -bin-annot %s -warn-error +a-3-4-6-9-27-28-29-52))
+  (libraries (
+   xapi_internal
+  ))
+))
+|}(flags rewriters) coverage_rewriter (flags rewriters)
diff --git a/ocaml/xapi/upload_receive.ml b/ocaml/xapi/upload_receive.ml
diff --git a/ocaml/xapi/xenstore_copy.ml b/ocaml/xapi/xenstore_copy.ml