diff options
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi2-basics.exp | 24 |
2 files changed, 19 insertions, 10 deletions
diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index fec3158f252..40b573908cd 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2004-01-12 Elena Zannoni <ezannoni@redhat.com> + * gdb.mi/mi2-basics.exp: Make sure that full pathnames are + escaped correctly. + +2004-01-12 Elena Zannoni <ezannoni@redhat.com> + * gdb.base/sepdebug.exp: New file. * gdb.base/sepdebug.c: New file. * lib/gdb.exp (separate_debug_filename): New procedure. diff --git a/gdb/testsuite/gdb.mi/mi2-basics.exp b/gdb/testsuite/gdb.mi/mi2-basics.exp index 44d2e4b9dfa..a86ba3765b5 100644 --- a/gdb/testsuite/gdb.mi/mi2-basics.exp +++ b/gdb/testsuite/gdb.mi/mi2-basics.exp @@ -1,4 +1,4 @@ -# Copyright 1999, 2000 Free Software Foundation, Inc. +# Copyright 1999, 2000, 2004 Free Software Foundation, Inc. # This program is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -40,6 +40,9 @@ if [mi_gdb_start] { set testfile "basics" set srcfile ${testfile}.c set binfile ${objdir}/${subdir}/${testfile} +set escapedobjdir [string_to_regexp ${objdir}] +set escapedsrcdir [string_to_regexp ${srcdir}] + if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug additional_flags=-DFAKEARGV}] != "" } { gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." } @@ -154,13 +157,14 @@ proc test_dir_specification {} { # -environment-directory # -environment-directory -r -#exp_internal 1 + set envirodir [string_to_regexp ${srcdir}/${subdir}] + mi_gdb_test "202-environment-directory ${srcdir}/${subdir}" \ - "\\\^done,source-path=\"${srcdir}/${subdir}.\\\$cdir.\\\$cwd\"" \ + "\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \ "environment-directory arg operation" mi_gdb_test "203-environment-directory" \ - "\\\^done,source-path=\"${srcdir}/${subdir}.\\\$cdir.\\\$cwd\"" \ + "\\\^done,source-path=\"${envirodir}.\\\$cdir.\\\$cwd\"" \ "environment-directory empty-string operation" mi_gdb_test "204-environment-directory -r" \ @@ -174,6 +178,7 @@ proc test_cwd_specification {} { global mi_gdb_prompt global objdir global subdir + global escapedobjdir # Change the working directory, then print the current working directory # Tests: @@ -185,7 +190,7 @@ proc test_cwd_specification {} { "environment-cd arg operation" mi_gdb_test "206-environment-pwd" \ - "\\\^done,cwd=\"${objdir}\"" \ + "\\\^done,cwd=\"${escapedobjdir}\"" \ "environment-pwd operation" } @@ -194,6 +199,8 @@ proc test_path_specification {} { global orig_path global objdir global srcdir + global escapedobjdir + global escapedsrcdir # Add to the path, display, then reset # Tests: @@ -202,8 +209,6 @@ proc test_path_specification {} { # -environment-path -r dir # -environment-path -r -#exp_internal 1 - send_gdb "-environment-path\n" gdb_expect 20 { -re "\\\^done,path=\"\(.*\)\"\r\n$mi_gdb_prompt" { @@ -220,18 +225,17 @@ proc test_path_specification {} { "environment-path no-args operation" mi_gdb_test "208-environment-path $srcdir $objdir" \ - "\\\^done,path=\"$srcdir.$objdir.$orig_path\"" \ + "\\\^done,path=\"$escapedsrcdir.$escapedobjdir.$orig_path\"" \ "environment-path dir1 dir2 operation" mi_gdb_test "209-environment-path -r $objdir" \ - "\\\^done,path=\"$objdir.$orig_path\"" \ + "\\\^done,path=\"$escapedobjdir.$orig_path\"" \ "environment-path -r dir operation" mi_gdb_test "210-environment-path -r" \ "\\\^done,path=\"$orig_path\"" \ "environment-path -r operation" -#exp_internal 0 } if [test_mi_interpreter_selection] { |