← Back to branch summary

~akopytov/percona-xtrabackup/pxb-157-2.1

« back to all changes in this revision

Viewing changes to test/run.sh

  • Committer: Alexey Kopytov
  • Date: 2014-04-30 04:46:57 UTC
  • Revision ID: akopytov@gmail.com-20140430044657-f4xx45pgts9lfx6h
PXB-157: Failing galera55 builds in PXB Jenkins

The problem was that with addition of galera3 paths to libgalera_smm.so
have changed in PXC 5.5, but not in PXB 5.6 (yet).

Fixed by checking the location of libgalera_smm.so on startup in run.sh,
and using the $LIBGALERA_PATH variable set in run.sh instead of
hard-coded paths in tests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
test/run.sh
388
388
doesn't have Galera support."
389
389
    fi
390
390
 
 
391
    if [ -n "$WSREP_READY" ]
 
392
    then
 
393
       if [ -f ${MYSQL_BASEDIR}/lib/libgalera_smm.so ]
 
394
       then
 
395
           LIBGALERA_PATH=${MYSQL_BASEDIR}/lib/libgalera_smm.so
 
396
       elif [ -f ${MYSQL_BASEDIR}/lib/galera2/libgalera_smm.so ]
 
397
       then
 
398
           LIBGALERA_PATH=${MYSQL_BASEDIR}/lib/galera2/libgalera_smm.so
 
399
       else
 
400
           die "Cannot find libgalera_smm.so"
 
401
       fi
 
402
    fi
 
403
 
391
404
    # Version-specific defaults
392
405
    DEFAULT_IBDATA_SIZE="10M"
393
406
 
464
477
    export MYSQL_VERSION MYSQL_VERSION_COMMENT MYSQL_FLAVOR \
465
478
        INNODB_VERSION XTRADB_VERSION INNODB_FLAVOR \
466
479
        XB_BIN IB_BIN IB_ARGS XB_ARGS MYSQLD_EXTRA_ARGS \
467
 
        DEFAULT_IBDATA_SIZE XB_BUILD WSREP_READY
 
480
        DEFAULT_IBDATA_SIZE XB_BUILD WSREP_READY LIBGALERA_PATH
468
481
}
469
482
 
470
483
###########################################################################