1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pilot.blaudden:/home/msvensson/mysql/mysql-4.1-maint

Browse Source 
into  pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint


mysql-test/mysql-test-run.pl:
  Manual merge
This commit is contained in:
unknown 2007-03-08 14:55:39 +01:00
commit d6bd171fd2
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
mysql-test/mysql-test-run.pl
View File

@ -4892,9 +4892,7 @@ sub debugger_arguments {
my $exe= shift; my $exe= shift;
my $debugger= $opt_debugger || $opt_client_debugger; my $debugger= $opt_debugger || $opt_client_debugger;
# FIXME Need to change the below "eq"'s to if ( $debugger =~ /vcexpress|vc|devenv/ )
# "case unsensitive string contains"
if ( $debugger eq "vcexpress" or $debugger eq "vc")
{ {
# vc[express] /debugexe exe arg1 .. argn # vc[express] /debugexe exe arg1 .. argn
@ -4902,22 +4900,37 @@ sub debugger_arguments {
unshift(@$$args, "/debugexe"); unshift(@$$args, "/debugexe");
unshift(@$$args, "$$exe"); unshift(@$$args, "$$exe");
# Set exe to debuggername
$$exe= $debugger;
} }
elsif ( $debugger eq "windbg" ) elsif ( $debugger =~ /windbg/ )
{ {
# windbg exe arg1 .. argn # windbg exe arg1 .. argn
# Add name of the exe before args # Add name of the exe before args
unshift(@$$args, "$$exe"); unshift(@$$args, "$$exe");
# Set exe to debuggername
$$exe= $debugger;
}
elsif ( $debugger eq "dbx" )
{
# xterm -e dbx -r exe arg1 .. argn
unshift(@$$args, $$exe);
unshift(@$$args, "-r");
unshift(@$$args, $debugger);
unshift(@$$args, "-e");
$$exe= "xterm";
} }
else else
{ {
mtr_error("Unknown argument \"$debugger\" passed to --debugger"); mtr_error("Unknown argument \"$debugger\" passed to --debugger");
} }
# Set exe to debuggername
$$exe= $debugger;
} }