ocamltest: refactoring and implementation of hooks

1 files changed, 64 insertions, 40 deletions

diff --git a/ocamltest/.depend b/ocamltest/.depend
index 5e12b1abf6..ff3cfaf859 100644
--- a/ocamltest/.depend
+++ b/ocamltest/.depend
@@ -1,64 +1,88 @@
-run_unix.$(O): run_unix.c run.h run_common.h
-run_stubs.$(O): run_stubs.c run.h ../byterun/caml/mlvalues.h \
+run_unix.$(O): run_unix.c run.h ../byterun/caml/misc.h \
  ../byterun/caml/config.h ../byterun/caml/m.h ../byterun/caml/s.h \
- ../byterun/caml/misc.h ../byterun/caml/memory.h ../byterun/caml/gc.h \
- ../byterun/caml/mlvalues.h ../byterun/caml/major_gc.h \
- ../byterun/caml/freelist.h ../byterun/caml/minor_gc.h \
- ../byterun/caml/address_class.h ../byterun/caml/io.h
+ run_common.h
+run_stubs.$(O): run_stubs.c run.h ../byterun/caml/misc.h \
+ ../byterun/caml/config.h ../byterun/caml/m.h ../byterun/caml/s.h \
+ ../byterun/caml/mlvalues.h ../byterun/caml/misc.h \
+ ../byterun/caml/memory.h ../byterun/caml/gc.h ../byterun/caml/mlvalues.h \
+ ../byterun/caml/major_gc.h ../byterun/caml/freelist.h \
+ ../byterun/caml/minor_gc.h ../byterun/caml/address_class.h \
+ ../byterun/caml/io.h ../byterun/caml/osdeps.h ../byterun/caml/memory.h
 actions.cmo : environments.cmi actions.cmi
 actions.cmx : environments.cmx actions.cmi
 actions.cmi : environments.cmi
-backends.cmo : backends.cmi
-backends.cmx : backends.cmi
-backends.cmi :
-builtin_actions.cmo : variables.cmi testlib.cmi run_command.cmi \
-    ocamltest_config.cmi filetype.cmi filecompare.cmi environments.cmi \
-    builtin_variables.cmi builtin_modifiers.cmi backends.cmi actions.cmi \
+actions_helpers.cmo : variables.cmi run_command.cmi ocamltest_stdlib.cmi \
+    filecompare.cmi environments.cmi builtin_variables.cmi actions.cmi \
+    actions_helpers.cmi
+actions_helpers.cmx : variables.cmx run_command.cmx ocamltest_stdlib.cmx \
+    filecompare.cmx environments.cmx builtin_variables.cmx actions.cmx \
+    actions_helpers.cmi
+actions_helpers.cmi : variables.cmi environments.cmi actions.cmi
+builtin_actions.cmo : ocamltest_stdlib.cmi ocamltest_config.cmi \
+    environments.cmi builtin_variables.cmi actions_helpers.cmi actions.cmi \
     builtin_actions.cmi
-builtin_actions.cmx : variables.cmx testlib.cmx run_command.cmx \
-    ocamltest_config.cmx filetype.cmx filecompare.cmx environments.cmx \
-    builtin_variables.cmx builtin_modifiers.cmx backends.cmx actions.cmx \
+builtin_actions.cmx : ocamltest_stdlib.cmx ocamltest_config.cmx \
+    environments.cmx builtin_variables.cmx actions_helpers.cmx actions.cmx \
     builtin_actions.cmi
 builtin_actions.cmi : actions.cmi
-builtin_modifiers.cmo : environments.cmi builtin_variables.cmi \
-    builtin_modifiers.cmi
-builtin_modifiers.cmx : environments.cmx builtin_variables.cmx \
-    builtin_modifiers.cmi
-builtin_modifiers.cmi : environments.cmi
-builtin_tests.cmo : tests.cmi builtin_actions.cmi builtin_tests.cmi
-builtin_tests.cmx : tests.cmx builtin_actions.cmx builtin_tests.cmi
-builtin_tests.cmi : tests.cmi
 builtin_variables.cmo : variables.cmi builtin_variables.cmi
 builtin_variables.cmx : variables.cmx builtin_variables.cmi
 builtin_variables.cmi : variables.cmi
-environments.cmo : variables.cmi environments.cmi
-environments.cmx : variables.cmx environments.cmi
+environments.cmo : variables.cmi ocamltest_stdlib.cmi environments.cmi
+environments.cmx : variables.cmx ocamltest_stdlib.cmx environments.cmi
 environments.cmi : variables.cmi
-filecompare.cmo : testlib.cmi run_command.cmi filecompare.cmi
-filecompare.cmx : testlib.cmx run_command.cmx filecompare.cmi
+filecompare.cmo : run_command.cmi ocamltest_stdlib.cmi filecompare.cmi
+filecompare.cmx : run_command.cmx ocamltest_stdlib.cmx filecompare.cmi
 filecompare.cmi :
 filetype.cmo : filetype.cmi
 filetype.cmx : filetype.cmi
 filetype.cmi :
 main.cmo : tsl_semantics.cmi tsl_parser.cmi tsl_lexer.cmi tests.cmi \
-    testlib.cmi options.cmi ocamltest_config.cmi environments.cmi \
-    builtin_variables.cmi actions.cmi main.cmi
+    options.cmi ocamltest_stdlib.cmi environments.cmi builtin_variables.cmi \
+    actions_helpers.cmi actions.cmi main.cmi
 main.cmx : tsl_semantics.cmx tsl_parser.cmx tsl_lexer.cmx tests.cmx \
-    testlib.cmx options.cmx ocamltest_config.cmx environments.cmx \
-    builtin_variables.cmx actions.cmx main.cmi
+    options.cmx ocamltest_stdlib.cmx environments.cmx builtin_variables.cmx \
+    actions_helpers.cmx actions.cmx main.cmi
 main.cmi :
+ocaml_actions.cmo : variables.cmi ocamltest_stdlib.cmi ocamltest_config.cmi \
+    ocaml_variables.cmi ocaml_modifiers.cmi ocaml_backends.cmi filetype.cmi \
+    filecompare.cmi environments.cmi builtin_variables.cmi \
+    actions_helpers.cmi actions.cmi ocaml_actions.cmi
+ocaml_actions.cmx : variables.cmx ocamltest_stdlib.cmx ocamltest_config.cmx \
+    ocaml_variables.cmx ocaml_modifiers.cmx ocaml_backends.cmx filetype.cmx \
+    filecompare.cmx environments.cmx builtin_variables.cmx \
+    actions_helpers.cmx actions.cmx ocaml_actions.cmi
+ocaml_actions.cmi : actions.cmi
+ocaml_backends.cmo : ocamltest_stdlib.cmi ocaml_backends.cmi
+ocaml_backends.cmx : ocamltest_stdlib.cmx ocaml_backends.cmi
+ocaml_backends.cmi : ocamltest_stdlib.cmi
+ocaml_modifiers.cmo : ocamltest_stdlib.cmi ocamltest_config.cmi \
+    ocaml_variables.cmi environments.cmi builtin_variables.cmi \
+    ocaml_modifiers.cmi
+ocaml_modifiers.cmx : ocamltest_stdlib.cmx ocamltest_config.cmx \
+    ocaml_variables.cmx environments.cmx builtin_variables.cmx \
+    ocaml_modifiers.cmi
+ocaml_modifiers.cmi : environments.cmi
+ocaml_tests.cmo : tests.cmi ocamltest_config.cmi ocaml_actions.cmi \
+    builtin_actions.cmi ocaml_tests.cmi
+ocaml_tests.cmx : tests.cmx ocamltest_config.cmx ocaml_actions.cmx \
+    builtin_actions.cmx ocaml_tests.cmi
+ocaml_tests.cmi : tests.cmi
+ocaml_variables.cmo : variables.cmi ocaml_variables.cmi
+ocaml_variables.cmx : variables.cmx ocaml_variables.cmi
+ocaml_variables.cmi : variables.cmi
 ocamltest_config.cmo : ocamltest_config.cmi
 ocamltest_config.cmx : ocamltest_config.cmi
 ocamltest_config.cmi :
+ocamltest_stdlib.cmo : ocamltest_stdlib.cmi
+ocamltest_stdlib.cmx : ocamltest_stdlib.cmi
+ocamltest_stdlib.cmi :
 options.cmo : tests.cmi actions.cmi options.cmi
 options.cmx : tests.cmx actions.cmx options.cmi
 options.cmi :
-run_command.cmo : testlib.cmi run_command.cmi
-run_command.cmx : testlib.cmx run_command.cmi
+run_command.cmo : ocamltest_stdlib.cmi run_command.cmi
+run_command.cmx : ocamltest_stdlib.cmx run_command.cmi
 run_command.cmi :
-testlib.cmo : testlib.cmi
-testlib.cmx : testlib.cmi
-testlib.cmi :
 tests.cmo : actions.cmi tests.cmi
 tests.cmx : actions.cmx tests.cmi
 tests.cmi : environments.cmi actions.cmi
@@ -71,10 +95,10 @@ tsl_lexer.cmi : tsl_parser.cmi
 tsl_parser.cmo : tsl_ast.cmi tsl_parser.cmi
 tsl_parser.cmx : tsl_ast.cmx tsl_parser.cmi
 tsl_parser.cmi : tsl_ast.cmi
-tsl_semantics.cmo : variables.cmi tsl_ast.cmi tests.cmi testlib.cmi \
-    environments.cmi actions.cmi tsl_semantics.cmi
-tsl_semantics.cmx : variables.cmx tsl_ast.cmx tests.cmx testlib.cmx \
-    environments.cmx actions.cmx tsl_semantics.cmi
+tsl_semantics.cmo : variables.cmi tsl_ast.cmi tests.cmi environments.cmi \
+    actions.cmi tsl_semantics.cmi
+tsl_semantics.cmx : variables.cmx tsl_ast.cmx tests.cmx environments.cmx \
+    actions.cmx tsl_semantics.cmi
 tsl_semantics.cmi : tsl_ast.cmi tests.cmi environments.cmi actions.cmi
 variables.cmo : variables.cmi
 variables.cmx : variables.cmi