← Back to team overview

maria-developers team mailing list archive

Re: [Commits] Rev 3897: bzr merge -r4123..4144 codership/5.6 in lp:~maria-captains/maria/maria-10.0-galera


Hi, Jan!

On Oct 01, Jan Lindström wrote:
> Hi Nirbhay, Philip
> First of all, it is good to see that we have more galera tests. Few
> questions:
> == modified file 'mysql-test/mysql-test-run.pl'
> --- a/mysql-test/mysql-test-run.pl      2014-09-29 00:43:56 +0000
> +++ b/mysql-test/mysql-test-run.pl      2014-09-30 22:06:15 +0000
> @@ -3189,6 +3189,9 @@
>      mtr_report(" - adding wsrep, galera to default test suites");
>      push @DEFAULT_SUITES, qw(wsrep galera);
> +    # ADD scripts to $PATH to that wsrep_sst_* can be found
> +    $ENV{'PATH'} = $ENV{'PATH'}.':'.$basedir.'/scripts';
> Is this the right place to do this ? Serg already commented about the fact
> that we should not "temper" mtr globally, instead only when galera tests
> are run, I just wonder because at scripts directory contain other than
> wsrep scripts, does this affect existing tests...

And, just to note, in 10.1 I did it somewhat differently:

my ($path) = grep { -f "$_/wsrep_sst_rsync"; } "$::bindir/scripts", $::path_client_bindir;
return "No SST scripts" unless $path;

Note the differences:

- I check whether a script really exists

- I look in two locations - same paths where mtr looks for mysqlhotcopy

- the path is added to the beginning of the PATH, because we want to
  find our scripts before any other similar scripts that might happen to
  be in the PATH because of the existing MariaDB-Galera installation