From 10e1ff83ecd0ecbc4ed87dcf95d0d807c42ea5bd Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 4 Sep 2016 13:42:01 +0200 Subject: [PATCH] better identify C/C unit tests in mysql-test --- mysql-test/suite/unit/suite.pm | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/mysql-test/suite/unit/suite.pm b/mysql-test/suite/unit/suite.pm index 966fd278a52..76c62037b3d 100644 --- a/mysql-test/suite/unit/suite.pm +++ b/mysql-test/suite/unit/suite.pm @@ -43,11 +43,15 @@ sub start_test { my (@ctest_list)= `cd .. && ctest $opt_vs_config --show-only --verbose`; return "No ctest" if $?; - my ($command, %tests); + my ($command, %tests, $prefix); for (@ctest_list) { chomp; - $command= $' if /^\d+: Test command: +/; - $tests{$'}=$command if /^ +Test +#\d+: +/; + if (/^\d+: Test command: +/) { + $command= $'; + $prefix= /libmariadb/ ? 'conc_' : ''; + } elsif (/^ +Test +#\d+: +/) { + $tests{$prefix.$'}=$command; + } } bless { ctests => { %tests } }; }