X-Git-Url: http://matita.cs.unibo.it/gitweb/?a=blobdiff_plain;f=helm%2FgTopLevel%2Fregtest.ml;h=bee1c28166a54f555ee0448253b4f32b08a6b774;hb=97c2d258a5c524eb5c4b85208899d80751a2c82f;hp=d90371759b21e98e10f2bcab460aa6272f202c0d;hpb=6cfcba76baa8f30c42624e911bd34a702f785766;p=helm.git

diff --git a/helm/gTopLevel/regtest.ml b/helm/gTopLevel/regtest.ml
index d90371759..bee1c2816 100644
--- a/helm/gTopLevel/regtest.ml
+++ b/helm/gTopLevel/regtest.ml
@@ -227,11 +227,13 @@ let as_expected report_fname expected found =
 let test_this mqi_handle uri_pred raw_term =
   let empty_context = [] in
   List.map
-   (function (env, metasenv, cic_term) ->
+   (function (env, metasenv, cic_term,ugraph ) ->
      let etype =
       try
-       CicPp.ppterm
-        (CicTypeChecker.type_of_aux' metasenv empty_context cic_term)
+	let ty, _ = 
+          (CicTypeChecker.type_of_aux' metasenv empty_context cic_term ugraph)
+	in
+	  CicPp.ppterm ty
       with _ -> "MALFORMED"
      in
      let ereduced =
@@ -246,7 +248,7 @@ let test_this mqi_handle uri_pred raw_term =
        etype = etype ^ "\n";
        ereduced = ereduced ^ "\n";
      }
-   ) (BatchParser.parse mqi_handle ~uri_pred raw_term)
+   ) (BatchParser.parse mqi_handle ~uri_pred raw_term CicUniv.empty_ugraph)
 
 let dump_environment filename =
   try
@@ -338,10 +340,14 @@ let _ =
   (fun ?(append_NL = true) msg ->
     (if append_NL then prerr_endline else prerr_string)
       (HelmLogger.string_of_html_msg msg));
- 
- let mqi_debug_fun = ignore in
- let mqi_handle = MQIConn.init ~log:mqi_debug_fun () in
- 
+ Helm_registry.load_from "gTopLevel.conf.xml";
+ let dbd =
+  Mysql.quick_connect
+    ~host:(Helm_registry.get "db.host")
+    ~user:(Helm_registry.get "db.user")
+    ~database:(Helm_registry.get "db.database")
+    ()
+ in
  let fnames = ref [] in
  let gen = ref false in
  let tryvars = ref false in
@@ -375,5 +381,5 @@ let _ =
   if !fnames = [] then
    Arg.usage spec (Sys.argv.(0) ^ ": missing argument test. You must provide at least one test file.\n" ^ usage) ;
   if !varsprefix = "###" then varsprefix := !prefix ;
-  main mqi_handle !gen ((!gen || !dump) && (not !nodump)) !fnames !tryvars !prefix !varsprefix;
-  MQIConn.close mqi_handle
+  main dbd !gen ((!gen || !dump) && (not !nodump)) !fnames !tryvars !prefix !varsprefix;
+  Mysql.disconnect dbd