maria-developers team mailing list archive

[knielsen@xxxxxxxxxxxxxxx]

#At lp:maria

 2785 knielsen@xxxxxxxxxxxxxxx	2010-01-04
      Test skip due to missing OQGraph early, avoiding errors in log when starting server.
      modified:
        mysql-test/lib/mtr_cases.pm

=== modified file 'mysql-test/lib/mtr_cases.pm'
--- a/mysql-test/lib/mtr_cases.pm	2009-12-06 17:34:54 +0000
+++ b/mysql-test/lib/mtr_cases.pm	2010-01-04 12:23:17 +0000
@@ -1109,6 +1109,16 @@ sub collect_one_test_case {
     }
   }
 
+  if ( $tinfo->{'oqgraph_test'} )
+  {
+    if ( !$ENV{'OQGRAPH_PLUGIN'} )
+    {
+      $tinfo->{'skip'}= 1;
+      $tinfo->{'comment'}= "Test requires the OQGraph storage engine";
+      return $tinfo;
+    }
+  }
+
 
   # Set extra config file to use
   if (defined $defaults_extra_file) {
@@ -1163,6 +1173,7 @@ my @tags=
  ["include/not_embedded.inc", "not_embedded", 1],
  ["include/not_valgrind.inc", "not_valgrind", 1],
  ["include/have_example_plugin.inc", "example_plugin_test", 1],
+ ["include/have_oqgraph_engine.inc", "oqgraph_test", 1],
  ["include/have_ssl.inc", "need_ssl", 1],
 );