fix: Do some cleanup & Fix mutation_testing test lib

Now, an optional library that demonstrates the use of grader libraries.

Author: AltGr

META.learn-ocaml.template

@@ -4,3 +4,4 @@ package "test_lib" (
   description = "Learn-ocaml dependencies for automatic graders"
   requires = "compiler-libs"
 )
+# DUNE_GEN

demo-repository/exercises/demo/test_libs.txt

@@ -0,0 +1 @@
+learn-ocaml.mutation_testing

src/grader-plugins/dune

@@ -0,0 +1,16 @@
+(library
+ (name mutation_testing)
+ (public_name learn-ocaml.mutation_testing)
+ (wrapped false)
+ (modes byte)
+ (libraries compiler-libs)
+ ;; The following lines are specific for compiling from within learn-ocaml.
+ ;; When writing grader-helper libs, use instead:
+ ;; (libraries learn-ocaml.test_lib)
+ ;; (preprocess (action (run %{libexec:learn-ocaml.test_lib:grader-ppx} %{input-file})))
+ (flags (:standard -I src/grader/test_lib -open Test_lib.Open_me))
+ (modules mutation_test)
+ (preprocess (pps grader_ppx))
+ (preprocessor_deps (alias ../grader/test_lib/test_lib_cmis))
+ ;; this is not a preprocessor deps, but dune does not allow other kinds of deps...
+)

src/grader/mutation_test.ml renamed to src/grader-plugins/mutation_test.ml

@@ -100,7 +100,7 @@ module M: sig
   val passed_mutation_testing: Learnocaml_report.t -> bool
 end
 
-include M
+include module type of M
 
 (** For backwards compatibility *)
-module Make (_: module type of Test_lib) = M
+module Make (_: module type of Test_lib): module type of M

src/grader/mutation_test.mli renamed to src/grader-plugins/mutation_test.mli

@@ -35,15 +35,15 @@
  (library_flags :standard -linkall)
  (libraries ty
             toploop
-            learnocaml_ppx_metaquot
             learnocaml_ppx_metaquot_lib
+            grader_ppx
             ocplib-json-typed
             learnocaml_report
             learnocaml_repository
             introspection_intf
             pre_test)
  (modules Test_lib)
- (preprocess (pps learnocaml_ppx_metaquot))
+ (preprocess (pps grader_ppx))
 )
 (rule
  (target testing_dyn.js)
@@ -167,29 +167,12 @@
            (run ocp-ocamlres -format ocamlres %{deps})))
 )
 
-;; cmis that are needed to precompile the graders for exercises
-(install
- (section lib)
- (package learn-ocaml)
- (files
-  (../ppx-metaquot/.ty.objs/byte/ty.cmi as test_lib/ty.cmi)
-  (../ppx-metaquot/.fun_ty.objs/byte/fun_ty.cmi as test_lib/fun_ty.cmi)
-;;  (.exercise_init.objs/byte/exercise_init.cmi as test_lib/exercise_init.cmi)
-  (.introspection_intf.objs/byte/introspection_intf.cmi as test_lib/introspection_intf.cmi)
-  (.pre_test.objs/byte/learnocaml_internal.cmi as test_lib/learnocaml_internal.cmi)
-  (.pre_test.objs/byte/pre_test.cmi as test_lib/pre_test.cmi)
-  (.learnocaml_report.objs/byte/learnocaml_report.cmi as test_lib/learnocaml_report.cmi)
-  (.pre_test.objs/byte/learnocaml_callback.cmi as test_lib/learnocaml_callback.cmi) ;;FIXME separate lib??
-  (.testing_dyn.objs/byte/test_lib.cmi as test_lib/test_lib.cmi))
-)
-
-
 (library
  (name grading)
  (wrapped false)
  (modes byte)
  (library_flags :standard -linkall)
- (libraries learnocaml_ppx_metaquot
+ (libraries grader_ppx
             ocplib-ocamlres.runtime
             toploop
             learnocaml_internal_intf
@@ -201,7 +184,7 @@
  (modules Introspection
           Embedded_grading_lib
           Grading)
- (preprocess (per_module ((pps ppx_ocplib_i18n learnocaml_ppx_metaquot) Grading)))
+ (preprocess (per_module ((pps ppx_ocplib_i18n grader_ppx) Grading)))
 )
 
 

src/grader/dune

@@ -0,0 +1,30 @@
+;; cmis that are needed to precompile the graders for exercises
+
+(rule
+ (alias test_lib_cmis)
+ (action (progn
+           (copy %{dep:../../ppx-metaquot/.ty.objs/byte/ty.cmi} ty.cmi)
+           (copy %{dep:../../ppx-metaquot/.fun_ty.objs/byte/fun_ty.cmi} fun_ty.cmi)
+           ;;  (copy %{dep:../.exercise_init.objs/byte/exercise_init.cmi} exercise_init.cmi)
+           (copy %{dep:../.introspection_intf.objs/byte/introspection_intf.cmi} introspection_intf.cmi)
+           (copy %{dep:../.pre_test.objs/byte/learnocaml_internal.cmi} learnocaml_internal.cmi)
+           (copy %{dep:../.pre_test.objs/byte/pre_test.cmi} pre_test.cmi)
+           (copy %{dep:../.learnocaml_report.objs/byte/learnocaml_report.cmi} learnocaml_report.cmi)
+           (copy %{dep:../.pre_test.objs/byte/learnocaml_callback.cmi} learnocaml_callback.cmi)
+           (copy %{dep:../.testing_dyn.objs/byte/test_lib.cmi} test_lib.cmi)))
+)
+
+(install
+ (section lib)
+ (package learn-ocaml)
+ (files
+  (ty.cmi as test_lib/ty.cmi)
+  (fun_ty.cmi as test_lib/fun_ty.cmi)
+  ;;   (exercise_init.cmi as test_lib/exercise_init.cmi)
+  (introspection_intf.cmi as test_lib/introspection_intf.cmi)
+  (learnocaml_internal.cmi as test_lib/learnocaml_internal.cmi)
+  (pre_test.cmi as test_lib/pre_test.cmi)
+  (learnocaml_report.cmi as test_lib/learnocaml_report.cmi)
+  (learnocaml_callback.cmi as test_lib/learnocaml_callback.cmi)
+  (test_lib.cmi as test_lib/test_lib.cmi))
+)

src/grader/test_lib/dune

@@ -20,30 +20,23 @@
  (libraries ppx_tools compiler-libs)
 )
 
-;; (library
-;;  (name learnocaml_recorder)
-;;  (wrapped false)
-;;  (modules Recorder)
-;;  (libraries ppxlib))
-
 (library
- (name learnocaml_ppx_metaquot)
+ (name grader_ppx)
  (wrapped false)
  (libraries learnocaml_ppx_metaquot_lib ty fun_ty ocaml-migrate-parsetree ppxlib)
- (modules Ppx_autoregister Ppx_metaquot_grader)
+ (modules Ppx_autoregister Grader_ppx)
  (kind ppx_rewriter)
 )
 
 (executable
- (name ppx_metaquot_main)
- (modules ppx_metaquot_main)
- (libraries learnocaml_ppx_metaquot))
+ (name grader_ppx_main)
+ (modules grader_ppx_main)
+ (libraries grader_ppx))
 
 (install
  (section libexec)
  (package learn-ocaml)
- (files
-  (ppx_metaquot_main.exe as grading_ppx/learnocaml-ppx-grader))
+ (files (grader_ppx_main.exe as test_lib/grader-ppx))
 )
 
 (library

src/ppx-metaquot/dune

@@ -0,0 +1,2 @@
+let () =
+  Migrate_parsetree.Driver.run_main ~exit_on_error:true ()

src/ppx-metaquot/ppx_metaquot_grader.ml renamed to src/ppx-metaquot/grader_ppx.ml

@@ -3,11 +3,10 @@
 open Lwt.Infix
 
 (* FIXME: make these configurable *)
-let grading_cmis_dir, grading_ppx_dir =
+let grading_cmis_dir =
   let prefix = Filename.dirname (Filename.dirname (Sys.executable_name)) in
   let ( / ) = Filename.concat in
-  ref (prefix/"lib"/"learn-ocaml"/"test_lib"),
-  ref (prefix/"lib"/"learn-ocaml"/"grading_ppx")
+  ref (prefix/"lib"/"learn-ocaml"/"test_lib")
 
 let run ?dir cmd args =
   Lwt_process.exec ?cwd:dir ("", Array.of_list (cmd::args)) >>= function
@@ -85,7 +84,7 @@ let precompile ~exercise_dir =
      jsoo ~dir [] ~source:"exercise.cma" ~target:"exercise.js");
     (ocamlc ~dir (["-c";
                    "-I"; "+compiler-libs";
-                   "-ppx"; Filename.concat !grading_ppx_dir "learnocaml-ppx-grader"]
+                   "-ppx"; Filename.concat !grading_cmis_dir "grader-ppx --as-ppx"]
                   @ grader_flags)
        ~opn:["Learnocaml_callback"; "Prelude"; "Prepare"; "Test_lib.Open_me"]
        ~source:["test.ml"]