.

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/xpathcomp@94 3cdefd35-fc62-479d-8e8d-bae585ffb9ca

diff --git a/benchmark/config.ml b/benchmark/config.ml
index 7719818..422c0c4 100644 (file)
--- a/benchmark/config.ml
+++ b/benchmark/config.ml
@@ -2,7 +2,7 @@
 let documents = [ "../tests/tiny.xml" ]
 
 (* semi-colon separated list of XPath queries *)
-let queries = [ "//*[ contains(.//para//self::text(),\"international\") ]//para//acronym" ]
+let queries = [ "//para[ contains(.,\"international\") ]//acronym"; "//*//*//*//*"; "/*"; "//part//text()" ]
 
 
 (* I is the initial configuration
@@ -14,7 +14,7 @@ let queries = [ "//*[ contains(.//para//self::text(),\"international\") ]//para/
 
 module CONF : CONFIGURATION = 
 struct
-  let path = "."
+  let path = "output"
   let result_basename = "test"
   let num_runs = 2
   let run_with_output = true
@@ -23,5 +23,9 @@ end
 
 module I = INIT_TESTER (CONF)
 
-module TEST = MK (SXSI) (MK (SaxonBXQuery) (I))
+module TEST = 
+  MK (SXSI) 
+    (MK (XsltProc) 
+       (MK (QizxOpen) 
+         (MK (SaxonBXQuery) (I))))
 

diff --git a/benchmark/main.ml b/benchmark/main.ml
index fff21c3..111f421 100644 (file)
--- a/benchmark/main.ml
+++ b/benchmark/main.ml
@@ -27,6 +27,26 @@ Saxon 9.0.0.4J from Saxonica"
   let reference = false
 end
 
+module QizxOpen : ENGINE =
+struct
+  let name = "QizxOpen"
+
+    (* Todo call the binary to actually compute the version string *)
+  let description = 
+"QizX/Open v2.1
+Java version 1.6.0_0"
+  let command = "/usr/local/qizxopen-2.1/bin/qizx"
+  let reference = false
+  let time_factor = 1.0
+  let mk_queryfile b doc q out = build_xquery doc q out b
+  let mk_cmdline b qout qfile _ _ = [ "-v" ; "-out"^ (if b then qout else "/dev/null");"-q"; qfile ]
+  let parse_rules = [  
+    (".*display time: \\([0-9]+\\) ms.*",
+     [ Query_execution_time 1 ]);
+  ]
+  let reference = false
+end
+
 module XsltProc : ENGINE =
 struct
   let name = "XSLTProc"