Changes in directory llvm/test/lib:
llvm2cpp.exp updated: 1.2 -> 1.3
---
Log message:
Fix a bug with diffing the wrong files. Make output more readable.
---
Diffs of the changes: (+7 -7)
llvm2cpp.exp | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
Index: llvm/test/lib/llvm2cpp.exp
diff -u llvm/test/lib/llvm2cpp.exp:1.2 llvm/test/lib/llvm2cpp.exp:1.3
--- llvm/test/lib/llvm2cpp.exp:1.2 Sun May 28 02:22:42 2006
+++ llvm/test/lib/llvm2cpp.exp Mon May 29 13:09:38 2006
@@ -31,6 +31,7 @@
set executable [file join Output $filename.exe]
set output [file join Output $filename.gen]
set assembly [file join Output $filename.asm]
+ set testname [file rootname $filename]
set retval [ catch {
exec -keepnewline $llvmas $test -o - | $llvmdis -f -o $assembly } msg
]
@@ -41,7 +42,7 @@
}
set retval [ catch {
- exec -keepnewline $llvm2cpp -f -o $generated $test } msg]
+ exec -keepnewline $llvm2cpp -f -o $generated < $test } msg]
if { $retval != 0 } {
fail "$test: llvm2cpp returned $retval\n$msg"
@@ -55,19 +56,18 @@
continue
}
- set retval [ catch {
- exec -keepnewline $executable > $output } msg ]
-
+ set retval [ catch { exec -keepnewline $executable > $output } msg ]
if { $retval != 0 } {
- fail "$test: $filename returned $retval\n$msg"
+ set execname [file tail $executable]
+ fail "$test: $execname returned $retval:\n$msg"
continue
}
set retval [ catch {
- exec -keepnewline diff -u $assembly $generated } msg ]
+ exec -keepnewline diff $assembly $output } msg ]
if { $retval != 0 } {
- fail "$test: diff returned $retval\n$msg"
+ fail "$test: diff returned $retval:\n$msg"
continue
}
pass "$test"
_______________________________________________
llvm-commits mailing list
llvm-commits@cs.uiuc.edu
http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits
