keiths / rpms / gdb

Forked from rpms/gdb 10 days ago
Clone
4dddad4
2007-01-13  Jan Kratochvil  <jan.kratochvil@redhat.com>
4dddad4
4dddad4
	* lib/gdb.exp (get_compiler_info): Cope with nondefault output logs.
4dddad4
4dddad4
4dddad4
diff -u -rupN gdb-6.5-ppc/gdb/testsuite/lib/gdb.exp gdb-6.5/gdb/testsuite/lib/gdb.exp
4dddad4
--- gdb-6.5-ppc/gdb/testsuite/lib/gdb.exp	2007-01-12 14:33:26.000000000 -0500
4dddad4
+++ gdb-6.5/gdb/testsuite/lib/gdb.exp	2007-01-12 21:15:02.000000000 -0500
4dddad4
@@ -1351,9 +1351,10 @@ proc get_compiler_info {binfile args} {
4dddad4
 
4dddad4
     # Run $ifile through the right preprocessor.
4dddad4
     # Toggle gdb.log to keep the compiler output out of the log.
4dddad4
+    set log_old [log_file -info]
4dddad4
     log_file
4dddad4
     set cppout [ gdb_compile "${ifile}" "" preprocess [list "$args" quiet] ]
4dddad4
-    log_file -a "$outdir/$tool.log" 
4dddad4
+    eval "log_file $log_old"
4dddad4
 
4dddad4
     # Eval the output.
4dddad4
     set unknown 0
376c428
376c428
376c428
2007-01-14  Jan Kratochvil  <jan.kratochvil@redhat.com>
376c428
376c428
	* lib/gdb.exp: Abort on missing `site.exp'.
376c428
376c428
376c428
diff -u -rup gdb-6.5-orig/gdb/testsuite/lib/gdb.exp gdb-6.5/gdb/testsuite/lib/gdb.exp
376c428
--- gdb-6.5-orig/gdb/testsuite/lib/gdb.exp	2006-12-17 11:59:42.000000000 +0100
376c428
+++ gdb-6.5/gdb/testsuite/lib/gdb.exp	2007-01-14 16:27:03.000000000 +0100
376c428
@@ -22,6 +22,12 @@
376c428
 # need to be modified for any target, it can be done with a variable
376c428
 # or by passing arguments.
376c428
 
376c428
+if {$tool == ""} {
376c428
+    # Tests would fail, logs on get_compiler_info() would be missing.
376c428
+    send_error "`site.exp' not found, run `make site.exp'!\n"
376c428
+    exit 2
376c428
+}
376c428
+
376c428
 load_lib libgloss.exp
376c428
 
376c428
 global GDB