setup mysql and run mysql tests on percona builds

scripts/run.mysql.tests.bash

@@ -114,31 +114,32 @@ if [ -z $engine ] ; then
     # run the tests
     pushd $mysql_basedir/mysql-test
     if [ $? = 0 ] ; then
- 
-        if [[ $mysqlbuild =~ mysql-5.6 ]] || [[ $mysqlbuild =~ mariadb-10 ]] || [[ $mysqlbuild =~ Percona ]] ; then
-            ./mysql-test-run.pl --suite=$teststorun_original --big-test --mysqld=--loose-tokudb-debug=3072 --max-test-fail=0 --force --retry=1 --testcase-timeout=60 \
-                --parallel=$parallel >>$testresultsdir/$tracefile 2>&1
-        else
-            ./mysql-test-run.pl --suite=$teststorun_original --big-test --max-test-fail=0 --force --retry=1 --testcase-timeout=60 \
-                --mysqld=--default-storage-engine=myisam --mysqld=--sql-mode="" \
-                --mysqld=--loose-tokudb_debug=3072 --mysqld=--loose-tokudb_hide_default_row_format=1 \
-                --parallel=$parallel >>$testresultsdir/$tracefile 2>&1
-        fi
-        
-        if [[ $mysqlbuild =~ Percona ]] ; then
-            ./mysql-test-run.pl --suite=$teststorun_tokudb --big-test --mysqld=--plugin-load=tokudb=ha_tokudb.so --mysqld=--loose-tokudb_debug=3072 --max-test-fail=0 --force --retry=1 --testcase-timeout=60 \
-                --parallel=$parallel >>$testresultsdir/$tracefile 2>&1  
-        else
+        if [[ $mysqlbuild =~ tokudb ]] ; then
+            # run standard tests
+            if [[ $mysqlbuild =~ 5.5 ]] ; then
+                ./mysql-test-run.pl --suite=$teststorun_original --big-test --max-test-fail=0 --force --retry=1 --testcase-timeout=60 \
+                    --mysqld=--default-storage-engine=myisam --mysqld=--sql-mode="" \
+                    --mysqld=--loose-tokudb_debug=3072 --mysqld=--loose-tokudb_hide_default_row_format=1 \
+                    --parallel=$parallel >>$testresultsdir/$tracefile 2>&1
+            else
+                ./mysql-test-run.pl --suite=$teststorun_original --big-test --max-test-fail=0 --force --retry=1 --testcase-timeout=60 \
+                    --mysqld=--loose-tokudb_debug=3072 --mysqld=--loose-tokudb_hide_default_row_format=1 \
+                    --parallel=$parallel >>$testresultsdir/$tracefile 2>&1
+            fi
+            # run tokudb tests
             ./mysql-test-run.pl --suite=$teststorun_tokudb --big-test --max-test-fail=0 --force --retry=1 --testcase-timeout=60 \
                 --mysqld=--default-storage-engine=tokudb \
                 --mysqld=--loose-tokudb_debug=3072 --mysqld=--loose-tokudb_hide_default_row_format=1 \
                 --parallel=$parallel >>$testresultsdir/$tracefile 2>&1  
+            # setup for engines tests
+            engine="tokudb"
+        else
+            ./mysql-test-run.pl --suite=$teststorun_original --big-test --max-test-fail=0 --force --retry=1 --testcase-timeout=60 \
+                --parallel=$parallel >>$testresultsdir/$tracefile 2>&1
         fi
-        exitcode=$?
         popd
     fi
     
-    engine="tokudb"
 fi
 
 if [ ! -z $engine ] ; then
@@ -148,7 +149,6 @@ if [ ! -z $engine ] ; then
         ./mysql-test-run.pl --suite=$teststorun --force --retry-failure=0 --max-test-fail=0 --nowarnings --testcase-timeout=60 \
             --mysqld=--default-storage-engine=$engine --mysqld=--loose-tokudb_hide_default_row_format=1 \
             --parallel=$parallel >>$testresultsdir/$tracefile 2>&1
-        exitcode=$?
         popd
     fi
 fi
@@ -168,7 +168,7 @@ while read line ; do
 done <$testresultsdir/$tracefile
 
 # commit the results
-if [ $exitcode = 0 -a $tests_failed = 0 ] ; then
+if [ $tests_failed = 0 ] ; then
     testresult="PASS=$tests_passed"
 else
     testresult="FAIL=$tests_failed PASS=$tests_passed"

scripts/setup.mysql.bash

@@ -51,9 +51,8 @@ if [[ $mysqlbuild =~ (.*)-(tokudb\-.*)-(linux)-(x86_64) ]] ; then
     system=${BASH_REMATCH[3]}
     arch=${BASH_REMATCH[4]}
 else
-    echo $muysqlbuild is not a tokudb build
+    echo $mysqlbuild is not a tokudb build
 fi
-mysqltarball=$mysqlbuild.tar.gz
 
 if [ ! -d downloads ] ; then mkdir downloads; fi
 
@@ -62,6 +61,16 @@ if [ $? != 0 ] ; then exit 1; fi
 
 basedir=$PWD
 
+mysqltarball=$mysqlbuild.tar.gz
+
+if [ -f $mysqlbuild.tar.gz ] ; then
+    compression=-z
+    mysqltarball=$mysqlbuild.tar.gz
+elif [ -f $mysqlbuild.tar.bz2 ] ; then
+    compression=-j
+    mysqltarball=$mysqlbuild.tar.bz2
+fi
+
 # get the release
 if [ ! -f $mysqltarball ] ; then
     s3get $s3bucket $mysqltarball $mysqltarball 
@@ -116,7 +125,7 @@ if [ ! -d $mysqlbuild ] || [ $install -ne 0 ] ; then
     rm mysql
     if [ -d $mysqlbuild ] ; then sudo rm -rf $mysqlbuild; fi
 
-    tar xzf $basedir/$mysqltarball
+    tar -x $compression -f $basedir/$mysqltarball
     if [ $? -ne 0 ] ; then exit 1; fi
     ln -s $mysqldir /usr/local/mysql
     if [ $? -ne 0 ] ; then exit 1; fi