mtr: read both suitedir/disabled.def and suitedir/t/disabled.def

this simplifies merging of MySQL and TokuDB
MariaDB · Feb 17, 2016 · 98be6ef · 98be6ef
1 parent dc92263
commit 98be6ef
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/mysql-test/lib/mtr_cases.pm b/mysql-test/lib/mtr_cases.pm
@@ -498,6 +498,7 @@ sub process_suite {
 
     # disabled.def
     parse_disabled($suite->{dir} .'/disabled.def', $suitename);
+    parse_disabled($suite->{dir} .'/t/disabled.def', $suitename);
 
     # combinations
     if (@::opt_combinations)