Commit 5e34b5da authored by ranger@regul.home.lan's avatar ranger@regul.home.lan
Browse files

Fixed stress parts in shell and perl versions of mysql-test-run script to limit stress testing 

with 20 test loops in case when any limit parameter was specified
parent e6b08a5e

mysql-test/lib/mtr_stress.pl

+8 −0
Original line number Diff line number Diff line
@@ -145,6 +145,14 @@ sub run_stress_test () 
    mtr_add_arg($args, "--stress-init-file=%", $::opt_stress_init_file);

  }



  if ( !$::opt_stress_loop_count && !$::opt_stress_test_count &&

       !$::opt_stress_test_duration )

  {

    #Limit stress testing with 20 loops in case when any limit parameter 

    #was specified 

    $::opt_stress_test_count=20;

  }



  if ( $::opt_stress_loop_count )

  {

    mtr_add_arg($args, "--loop-count=%s", $::opt_stress_loop_count);

mysql-test/mysql-test-run.pl

+1 −1
Original line number Diff line number Diff line
@@ -276,7 +276,7 @@ our $opt_stress= ""; 
our $opt_stress_suite=     "main";

our $opt_stress_mode=    "random";

our $opt_stress_threads=        5;

our $opt_stress_test_count=    20;

our $opt_stress_test_count=    "";

our $opt_stress_loop_count=    "";

our $opt_stress_test_duration= "";

our $opt_stress_init_file=     "";

mysql-test/mysql-test-run.sh

+10 −2
Original line number Diff line number Diff line
@@ -279,7 +279,7 @@ DO_STRESS="" 
STRESS_SUITE="main"

STRESS_MODE="random"

STRESS_THREADS=5

STRESS_TEST_COUNT=20

STRESS_TEST_COUNT=""

STRESS_LOOP_COUNT=""

STRESS_TEST_DURATION=""

STRESS_INIT_FILE=""
@@ -1906,7 +1906,7 @@ run_stress_test() 
                    --stress-basedir=$STRESS_BASEDIR \

                    --server-logs-dir=$STRESS_BASEDIR \

                    --stress-mode=$STRESS_MODE \

                    --mysqltest=$BASEDIR/client/mysqltest \

                    --mysqltest=$CLIENT_BINDIR/mysqltest \

                    --threads=$STRESS_THREADS \

                    --verbose \

                    --cleanup \
@@ -1917,6 +1917,14 @@ run_stress_test() 
    STRESS_TEST_ARGS="$STRESS_TEST_ARGS --stress-init-file=$STRESS_INIT_FILE"

  fi



  if [ -z "$STRESS_LOOP_COUNT" -a -z  "$STRESS_TEST_COUNT" -a 

       -z "$STRESS_TEST_DURATION" ] ; then 



    #Limit stress testing with 20 loops in case when any limit parameter

    #was specified

    STRESS_TEST_COUNT=20

  fi



  if [ -n "$STRESS_LOOP_COUNT" ] ; then 

    STRESS_TEST_ARGS="$STRESS_TEST_ARGS --loop-count=$STRESS_LOOP_COUNT"

  fi