Some more bugfixing for the contains.

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

diff --git a/benchmark/main.ml b/benchmark/main.ml
index a761bc2..ae45a49 100644 (file)
--- a/benchmark/main.ml
+++ b/benchmark/main.ml
@@ -70,7 +70,7 @@ struct
        ( ".*Compiling query :[ \\t]*\\([0-9]+\\.[0-9]*\\)ms.*",
         [ Query_compile_time 1]);
 
-       ( ".*TopDown (No BackTrack) :[ \\t]*\\([0-9]+\\.[0-9]*\\)ms.*",
+       ( ".*Execution time :[ \\t]*\\([0-9]+\\.[0-9]*\\)ms.*",
         [ Query_execution_time 1]);
 
        ( ".*Serializing results :[ \\t]*\\([0-9]+\\.[0-9]*\\)ms.*",
@@ -79,22 +79,17 @@ struct
 
 end
 
-module CONF : CONFIGURATION = 
-struct
-  let path = "."
-  let result_basename = "test"
-  let num_runs = 5
-  let run_with_output = true
-  let run_without_output = true
-end
 
-module I = INIT_TESTER (CONF)
-module Test = MK (SXSI) (MK (SaxonBXQuery) (I))
+INCLUDE "config.ml"
+
 
-let l = Test.test_engine [] (make_queryset 
-                              ["/home/kim/Documents/Work/Code/xpathcomp/tests/small.xml"] 
-                              ["/descendant::*/descendant::*/descendant::*"])
+let l = TEST.test_engine [] (make_queryset 
+                              documents
+                              queries
+                              )
 ;;
+
+
 List.iter (function (e,d),s -> 
             Printf.printf "\n--------------  %s   -----------------" e;
             Array.iter ( fun i ->