1 gdb/testsuite/gdb.base/fileio.c:
2 gdb/testsuite/gdb.base/fileio.exp:
3 2007-12-08 Jan Kratochvil <jan.kratochvil@redhat.com>
5 * gdb.base/fileio.c (ROOTSUBDIR): New macro.
6 (main): CHDIR into ROOTSUBDIR. CHOWN ROOTSUBDIR and CHDIR into
7 ROOTSUBDIR if we are being run as root.
8 * gdb.base/fileio.exp: Change the startup and finish cleanup.
9 Change the test file reference to be into the `fileio.dir' directory.
12 sources/gdb/testsuite/gdb.base/dump.exp:
13 Found on RHEL-5.s390x.
16 gdb-6.8.50.20090209/gdb/testsuite/gdb.base/auxv.exp:
17 random FAIL: gdb.base/auxv.exp: matching auxv data from live and gcore
20 gdb-6.8.50.20090209/gdb/testsuite/gdb.base/annota1.exp:
21 frames-invalid can happen asynchronously.
23 --- ./gdb/testsuite/gdb.base/fileio.c 13 Jun 2006 08:55:22 -0000 1.10
24 +++ ./gdb/testsuite/gdb.base/fileio.c 8 Dec 2007 16:04:10 -0000
25 @@ -58,6 +58,8 @@ system (const char * string);
26 1) Invalid string/command. - returns 127. */
27 static const char *strerrno (int err);
29 +#define ROOTSUBDIR "fileio.dir"
31 #define FILENAME "foo.fileio.test"
32 #define RENAMED "bar.fileio.test"
33 #define NONEXISTANT "nofoo.fileio.test"
34 @@ -542,6 +544,37 @@ strerrno (int err)
38 + /* ROOTSUBDIR is already prepared by fileio.exp. We use it for easy cleanup
39 + (by fileio.exp) if we are run by multiple users in the same directory. */
41 + if (chdir (ROOTSUBDIR) != 0)
43 + printf ("chdir " ROOTSUBDIR ": %s\n", strerror (errno));
48 + Open for write but no write permission returns EACCES
49 + Unlinking a file in a directory w/o write access returns EACCES
50 + fail if we are being run as root - drop the privileges here. */
52 + if (geteuid () == 0)
56 + if (chown (".", uid, uid) != 0)
58 + printf ("chown %d.%d " ROOTSUBDIR ": %s\n", (int) uid, (int) uid,
62 + if (setuid (uid) || geteuid () == 0)
64 + printf ("setuid %d: %s\n", (int) uid, strerror (errno));
69 /* Don't change the order of the calls. They partly depend on each other */
72 --- ./gdb/testsuite/gdb.base/fileio.exp 23 Aug 2007 18:14:16 -0000 1.12
73 +++ ./gdb/testsuite/gdb.base/fileio.exp 8 Dec 2007 16:04:10 -0000
74 @@ -46,8 +46,8 @@ if [get_compiler_info ${binfile}] {
78 -remote_exec build {sh -xc test\ -r\ dir2.fileio.test\ &&\ chmod\ -f\ +w\ dir2.fileio.test}
79 -remote_exec build {sh -xc rm\ -rf\ *.fileio.test}
80 +remote_exec build {sh -xc rm\ -rf\ fileio.dir}
81 +remote_exec build {sh -xc mkdir\ -m777\ fileio.dir}
83 set oldtimeout $timeout
84 set timeout [expr "$timeout + 60"]
85 @@ -88,7 +88,7 @@ gdb_test continue \
86 "Opening nonexistant file returns ENOENT"
88 send_gdb "continue\n" ; gdb_expect -re "$gdb_prompt $"
89 -catch "system \"chmod -f -w nowrt.fileio.test\""
90 +catch "system \"chmod -f -w fileio.dir/nowrt.fileio.test\""
93 "Continuing\\..*open 5:.*EACCES$stop_msg" \
94 @@ -252,8 +252,8 @@ gdb_test continue \
98 -remote_exec build {sh -xc test\ -r\ dir2.fileio.test\ &&\ chmod\ -f\ +w\ dir2.fileio.test}
99 -remote_exec build {sh -xc rm\ -rf\ *.fileio.test}
100 +remote_exec build {sh -xc test\ -r\ fileio.dir/dir2.fileio.test\ &&\ chmod\ -f\ +w\ fileio.dir/dir2.fileio.test}
101 +remote_exec build {sh -xc rm\ -rf\ fileio.dir}
103 set timeout $oldtimeout
105 --- sources/gdb/testsuite/gdb.base/dump.exp-orig 2008-08-28 11:44:40.000000000 +0200
106 +++ sources/gdb/testsuite/gdb.base/dump.exp 2008-08-28 11:44:49.000000000 +0200
107 @@ -493,8 +493,10 @@ if ![string compare $is64bitonly "no"] t
108 gdb_test "print zero_all ()" "" ""
110 # restore with expressions
111 + # Address may fit in int32 but its negative result would be 0xffffxxxx for
112 + # 64-bit LONGEST addresses.
113 test_restore_saved_value \
114 - "intarr3.srec ${array2_start}-${array_start} &intarray\[3\] &intarray\[4\]" \
115 + "intarr3.srec (long)${array2_start}-${array_start} &intarray\[3\] &intarray\[4\]" \
116 "array partial with expressions" 4 "intarray2\[3\]"
118 gdb_test "print intarray2\[2\] == 0" " = 1" "element 2 not changed, == 4"
119 --- gdb-6.8.50.20090209/gdb/testsuite/gdb.base/annota1.exp-orig 2009-02-09 16:31:11.000000000 +0100
120 +++ gdb-6.8.50.20090209/gdb/testsuite/gdb.base/annota1.exp 2009-02-09 21:27:38.000000000 +0100
121 @@ -286,7 +286,7 @@ if [target_info exists gdb,nosignals] {
123 send_gdb "signal SIGUSR1\n"
125 - -re "\r\n\032\032post-prompt\r\nContinuing with signal SIGUSR1.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032breakpoint 2\r\n\r\nBreakpoint 2, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nhandle_USR1\r\n\032\032frame-args\r\n \\(\r\n\032\032arg-begin\r\nsig\r\n\032\032arg-name-end\r\n=\r\n\032\032arg-value -\r\n$decimal\r\n\032\032arg-end\r\n\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n${escapedsrcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*annota1.c:.*:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
126 + -re "\r\n\032\032post-prompt\r\nContinuing with signal SIGUSR1.\r\n\r\n\032\032starting\r\n(\r\n\032\032frames-invalid\r\n)*\r\n\032\032breakpoint 2\r\n\r\nBreakpoint 2, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nhandle_USR1\r\n\032\032frame-args\r\n \\(\r\n\032\032arg-begin\r\nsig\r\n\032\032arg-name-end\r\n=\r\n\032\032arg-value -\r\n$decimal\r\n\032\032arg-end\r\n\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n${escapedsrcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*annota1.c:.*:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
127 { pass "send SIGUSR1" }
128 -re "\r\n\032\032post-prompt\r\nContinuing with signal SIGUSR1.\r\n\r\n\032\032starting\r\n\r\n\032\032frames-invalid\r\n\r\n\032\032breakpoint 2\r\n\r\nBreakpoint 2, \r\n\032\032frame-begin 0 $hex\r\n\r\n\032\032frame-function-name\r\nhandle_USR1\r\n\032\032frame-args\r\n \\(\r\n\032\032arg-begin\r\nsig\r\n\032\032arg-name-end\r\n=\r\n\032\032arg-value -\r\n$decimal\r\n\032\032arg-end\r\n\\)\r\n\032\032frame-source-begin\r\n at \r\n\032\032frame-source-file\r\n.*${srcfile}\r\n\032\032frame-source-file-end\r\n:\r\n\032\032frame-source-line\r\n.*\r\n\032\032frame-source-end\r\n\r\n\r\n\032\032source.*annota1.c:.*:.*:beg:$hex\r\n\r\n\032\032frame-end\r\n\r\n\032\032stopped\r\n$gdb_prompt$" \
129 { setup_xfail "*-*-*" 1270
130 --- ./gdb/testsuite/gdb.base/auxv.exp 2009-02-11 00:54:54.000000000 +0100
131 +++ ./gdb/testsuite/gdb.base/auxv.exp 2009-02-11 00:51:30.000000000 +0100
132 @@ -78,8 +78,10 @@ proc fetch_auxv {test} {
136 + # Former trailing `\[\r\n\]+' may eat just \r leaving \n in the buffer
137 + # corrupting the next matches.
138 if {[gdb_test_multiple "info auxv" $test {
139 - -re "info auxv\[\r\n\]+" {
140 + -re "info auxv\r\n" {
143 -ex "The program has no auxiliary information now" {
144 @@ -94,20 +96,20 @@ proc fetch_auxv {test} {
148 - -re "^\[0-9\]+\[ \t\]+(AT_\[^ \t\]+)\[^\r\n\]+\[\r\n\]+" {
149 + -re "^\[0-9\]+\[ \t\]+(AT_\[^ \t\]+)\[^\r\n\]+\r\n" {
150 lappend auxv_lines $expect_out(0,string)
153 - -re "^\[0-9\]+\[ \t\]+\\?\\?\\?\[^\r\n\]+\[\r\n\]+" {
154 + -re "^\[0-9\]+\[ \t\]+\\?\\?\\?\[^\r\n\]+\r\n" {
155 warning "Unrecognized tag value: $expect_out(0,string)"
157 lappend auxv_lines $expect_out(0,string)
160 - -re ".*$gdb_prompt $" {
161 + -re "$gdb_prompt $" {
164 - -re "^\[^\r\n\]+\[\r\n\]+" {
165 + -re "^\[^\r\n\]+\r\n" {
167 warning "Unrecognized output: $expect_out(0,string)"
169 --- ./gdb/testsuite/gdb.base/callfuncs.exp 2009-01-03 06:58:03.000000000 +0100
170 +++ ./gdb/testsuite/gdb.base/callfuncs.exp 2009-02-11 00:51:42.000000000 +0100
171 @@ -249,15 +249,17 @@ proc fetch_all_registers {test} {
173 set all_registers_lines {}
175 + # Former trailing `\[\r\n\]+' may eat just \r leaving \n in the buffer
176 + # corrupting the next matches.
177 if {[gdb_test_multiple "info all-registers" $test {
178 - -re "info all-registers\[\r\n\]+" {
179 + -re "info all-registers\r\n" {
182 -ex "The program has no registers now" {
186 - -re "^bspstore\[ \t\]+\[^\r\n\]+\[\r\n\]+" {
187 + -re "^bspstore\[ \t\]+\[^\r\n\]+\r\n" {
188 if [istarget "ia64-*-*"] {
189 # Filter out bspstore which is specially tied to bsp,
190 # giving spurious differences.
191 @@ -266,14 +268,14 @@ proc fetch_all_registers {test} {
195 - -re "^\[^ \t\]+\[ \t\]+\[^\r\n\]+\[\r\n\]+" {
196 + -re "^\[^ \t\]+\[ \t\]+\[^\r\n\]+\r\n" {
197 lappend all_registers_lines $expect_out(0,string)
200 - -re ".*$gdb_prompt $" {
201 + -re "$gdb_prompt $" {
204 - -re "^\[^\r\n\]+\[\r\n\]+" {
205 + -re "^\[^\r\n\]+\r\n" {
207 warning "Unrecognized output: $expect_out(0,string)"