← Back to branch summary

~drizzle-trunk/drizzle/development

« back to all changes in this revision

Viewing changes to tests/test-run.pl

  • Committer: Grant Limberg
  • Date: 2008-08-12 21:13:01 UTC
  • mto: (322.1.1 codestyle)
  • mto: This revision was merged to the branch mainline in revision 324.
  • Revision ID: grant@glsoftware.net-20080812211301-ym3wsowelkgp16s2
renamed all instances of MYSQL_ to DRIZZLE_

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/test-run.pl
1412
1412
  
1413
1413
  $ENV{'LC_COLLATE'}=         "C";
1414
1414
  $ENV{'USE_RUNNING_SERVER'}= $opt_extern;
1415
 
  $ENV{'MYSQL_TEST_DIR'}=     $glob_mysql_test_dir;
 
1415
  $ENV{'DRIZZLE_TEST_DIR'}=     $glob_mysql_test_dir;
1416
1416
  $ENV{'MYSQLTEST_VARDIR'}=   $opt_vardir;
1417
 
  $ENV{'MYSQL_TMP_DIR'}=      $opt_tmpdir;
 
1417
  $ENV{'DRIZZLE_TMP_DIR'}=      $opt_tmpdir;
1418
1418
  $ENV{'MASTER_MYSOCK'}=      $master->[0]->{'path_sock'};
1419
1419
  $ENV{'MASTER_MYSOCK1'}=     $master->[1]->{'path_sock'};
1420
1420
  $ENV{'MASTER_MYPORT'}=      $master->[0]->{'port'};
1442
1442
    $cmdline_mysqlcheck .=
1443
1443
      " --debug=d:t:A,$path_vardir_trace/log/mysqlcheck.trace";
1444
1444
  }
1445
 
  $ENV{'MYSQL_CHECK'}=              $cmdline_mysqlcheck;
 
1445
  $ENV{'DRIZZLE_CHECK'}=              $cmdline_mysqlcheck;
1446
1446
 
1447
1447
  # ----------------------------------------------------
1448
1448
  # Setup env to childs can execute myqldump
1457
1457
    $cmdline_mysqldumpslave .=
1458
1458
      " --debug=d:t:A,$path_vardir_trace/log/mysqldump-slave.trace";
1459
1459
  }
1460
 
  $ENV{'MYSQL_DUMP'}= $cmdline_mysqldump;
1461
 
  $ENV{'MYSQL_DUMP_SLAVE'}= $cmdline_mysqldumpslave;
 
1460
  $ENV{'DRIZZLE_DUMP'}= $cmdline_mysqldump;
 
1461
  $ENV{'DRIZZLE_DUMP_SLAVE'}= $cmdline_mysqldumpslave;
1462
1462
 
1463
1463
 
1464
1464
  # ----------------------------------------------------
1476
1476
      $cmdline_mysqlslap .=
1477
1477
        " --debug=d:t:A,$path_vardir_trace/log/mysqlslap.trace";
1478
1478
    }
1479
 
    $ENV{'MYSQL_SLAP'}= $cmdline_mysqlslap;
 
1479
    $ENV{'DRIZZLE_SLAP'}= $cmdline_mysqlslap;
1480
1480
  }
1481
1481
 
1482
1482
  # ----------------------------------------------------
1492
1492
    $cmdline_mysqlimport .=
1493
1493
      " --debug=d:t:A,$path_vardir_trace/log/mysqlimport.trace";
1494
1494
  }
1495
 
  $ENV{'MYSQL_IMPORT'}= $cmdline_mysqlimport;
 
1495
  $ENV{'DRIZZLE_IMPORT'}= $cmdline_mysqlimport;
1496
1496
 
1497
1497
 
1498
1498
  # ----------------------------------------------------
1511
1511
    $cmdline_mysqlbinlog .=
1512
1512
      " --debug=d:t:A,$path_vardir_trace/log/mysqlbinlog.trace";
1513
1513
  }
1514
 
  $ENV{'MYSQL_BINLOG'}= $cmdline_mysqlbinlog;
 
1514
  $ENV{'DRIZZLE_BINLOG'}= $cmdline_mysqlbinlog;
1515
1515
 
1516
1516
  # ----------------------------------------------------
1517
1517
  # Setup env so childs can execute mysql
1527
1527
  # ----------------------------------------------------
1528
1528
  # Setup env so childs can execute bug25714
1529
1529
  # ----------------------------------------------------
1530
 
  $ENV{'MYSQL_BUG25714'}=  $exe_bug25714;
 
1530
  $ENV{'DRIZZLE_BUG25714'}=  $exe_bug25714;
1531
1531
 
1532
1532
  # ----------------------------------------------------
1533
1533
  # Setup env so childs can execute drizzle_client_test
1534
1534
  # ----------------------------------------------------
1535
 
  $ENV{'MYSQL_CLIENT_TEST'}=  drizzle_client_test_arguments();
 
1535
  $ENV{'DRIZZLE_CLIENT_TEST'}=  drizzle_client_test_arguments();
1536
1536
 
1537
1537
 
1538
1538
  # ----------------------------------------------------
1546
1546
      "--user=root --password= " .
1547
1547
      "--basedir=$glob_basedir --bindir=$path_client_bindir --verbose " .
1548
1548
      "--port=$master->[0]->{'port'} ";
1549
 
    $ENV{'MYSQL_FIX_SYSTEM_TABLES'}=  $cmdline_mysql_fix_system_tables;
 
1549
    $ENV{'DRIZZLE_FIX_SYSTEM_TABLES'}=  $cmdline_mysql_fix_system_tables;
1550
1550
 
1551
1551
  }
1552
1552
 
1553
1553
  # ----------------------------------------------------
1554
1554
  # Setup env so childs can execute my_print_defaults
1555
1555
  # ----------------------------------------------------
1556
 
  $ENV{'MYSQL_MY_PRINT_DEFAULTS'}= mtr_native_path($exe_my_print_defaults);
 
1556
  $ENV{'DRIZZLE_MY_PRINT_DEFAULTS'}= mtr_native_path($exe_my_print_defaults);
1557
1557
 
1558
1558
  # ----------------------------------------------------
1559
1559
  # Setup env so childs can execute mysqladmin
1818
1818
  # the file will not return 0000
1819
1819
  my $file_mode= (stat($test_file))[2] & 07777;
1820
1820
 
1821
 
  $ENV{'MYSQL_TEST_ROOT'}= "NO";
 
1821
  $ENV{'DRIZZLE_TEST_ROOT'}= "NO";
1822
1822
  mtr_verbose("result: $result, file_mode: $file_mode");
1823
1823
  if ($result eq "MySQL" && $file_mode == 0)
1824
1824
  {
1825
1825
    mtr_warning("running this script as _root_ will cause some " .
1826
1826
                "tests to be skipped");
1827
 
    $ENV{'MYSQL_TEST_ROOT'}= "YES";
 
1827
    $ENV{'DRIZZLE_TEST_ROOT'}= "YES";
1828
1828
  }
1829
1829
 
1830
1830
  chmod(oct("0755"), $test_file);
3210
3210
  }
3211
3211
 
3212
3212
  # ----------------------------------------------------------------------
3213
 
  # export MYSQL_TEST variable containing <path>/drizzletest <args>
 
3213
  # export DRIZZLE_TEST variable containing <path>/drizzletest <args>
3214
3214
  # ----------------------------------------------------------------------
3215
 
  $ENV{'MYSQL_TEST'}=
 
3215
  $ENV{'DRIZZLE_TEST'}=
3216
3216
    mtr_native_path($exe_drizzletest) . " " . join(" ", @$args);
3217
3217
 
3218
3218
  # ----------------------------------------------------------------------
3219
 
  # Add arguments that should not go into the MYSQL_TEST env var
 
3219
  # Add arguments that should not go into the DRIZZLE_TEST env var
3220
3220
  # ----------------------------------------------------------------------
3221
3221
 
3222
3222
  if ( $opt_valgrind_drizzletest )