From c5e5b5e167c9d3b770917621b9deb1709155e22d Mon Sep 17 00:00:00 2001
From: unknown <msvensson@pilot.blaudden>
Date: Mon, 5 Mar 2007 09:52:40 +0100
Subject: [PATCH] Bug #26792 Add DBX debugger support to mysql-test-run.pl  -
 Add --debugger=dbx  - Fix --debugger=devenv, --debugger=DevEnv and
 --debugger=/path/devenv

mysql-test/mysql-test-run.pl:
  Add support for --debugger=dbx to mysql-test-run.pl
  Fix case senitive match for vc, vcexpress or deven
  Make it possible to use full path to debugger for
  --debugger=/path/vcexpress
---
 mysql-test/mysql-test-run.pl | 26 ++++++++++++++++++++------
 1 file changed, 20 insertions(+), 6 deletions(-)

diff --git a/mysql-test/mysql-test-run.pl b/mysql-test/mysql-test-run.pl
index 73396f2255b..21432687888 100755
--- a/mysql-test/mysql-test-run.pl
+++ b/mysql-test/mysql-test-run.pl
@@ -4745,9 +4745,7 @@ sub debugger_arguments {
   my $exe=  shift;
   my $debugger= $opt_debugger || $opt_client_debugger;
 
-  # FIXME Need to change the below "eq"'s to
-  # "case unsensitive string contains"
-  if ( $debugger eq "vcexpress" or $debugger eq "vc")
+  if ( $debugger =~ /vcexpress|vc|devenv/ )
   {
     # vc[express] /debugexe exe arg1 .. argn
 
@@ -4755,22 +4753,38 @@ sub debugger_arguments {
     unshift(@$$args, "/debugexe");
     unshift(@$$args, "$$exe");
 
+    # Set exe to debuggername
+    $$exe= $debugger;
+
   }
-  elsif ( $debugger eq "windbg" )
+  elsif ( $debugger =~ /windbg/ )
   {
     # windbg exe arg1 .. argn
 
     # Add name of the exe before args
     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
   {
     mtr_error("Unknown argument \"$debugger\" passed to --debugger");
   }
 
-  # Set exe to debuggername
-  $$exe= $debugger;
 }