Some more bugfixing for the contains.

[SXSI/xpathcomp.git] / benchmark / main.ml

diff --git a/benchmark/main.ml b/benchmark/main.ml
index 93c673b..ae45a49 100644 (file)
--- a/benchmark/main.ml
+++ b/benchmark/main.ml
@@ -62,7 +62,7 @@ struct
   let reference = false
   let time_factor = 1.0
   let mk_queryfile b doc q out = ()
-  let mk_cmdline b qout qfile doc q = [ "-d"; doc; q ]@ (if b then [qout] else [])
+  let mk_cmdline b qout qfile doc q = [ doc; q ]@ (if b then [qout] else [])
   let parse_rules = 
     [  ( ".*Parsing document :[ \\t]*\\([0-9]+\\.[0-9]*\\)ms.*",
         [ Input_parsing_time 1]);
@@ -79,29 +79,17 @@ struct
 
 end
 
-module CONF : CONFIGURATION = 
-struct
-  let path = "."
-  let result_basename = "test"
-  let num_runs = 1
-  let run_with_output = false
-  let run_without_output = true
-end
 
-module I = INIT_TESTER (CONF)
-module TestOld = MK (SXSI) (MK (SaxonBXQuery) (I))
-module Test = MK (SXSI) (I)
+INCLUDE "config.ml"
 
 
-let l = Test.test_engine [] (make_queryset 
-                              ["/home/kim/Documents/Work/Code/xpathcomp/tests/tiny.xml"] 
-                              ["/child::*"])
+let l = TEST.test_engine [] (make_queryset 
+                              documents
+                              queries
+                              )
 ;;
 
 
-
-
-
 List.iter (function (e,d),s -> 
             Printf.printf "\n--------------  %s   -----------------" e;
             Array.iter ( fun i ->