From af9807521461ee703baa93b3ec2f20f99f454eec Mon Sep 17 00:00:00 2001
From: Janis Johnson <janis187@us.ibm.com>
Date: Thu, 11 Nov 2004 18:00:30 +0000
Subject: [PATCH] linkage.exp: Prepend directory name to pass/fail message...

	* gcc.misc-tests/linkage.exp: Prepend directory name to pass/fail
	message, delete generated files, use more descriptive name for
	executable, and make the test unsupported when it cannot be run.

From-SVN: r90487
---
 gcc/testsuite/ChangeLog                  |  4 ++++
 gcc/testsuite/gcc.misc-tests/linkage.exp | 17 ++++++++++++-----
 2 files changed, 16 insertions(+), 5 deletions(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index f0f8dda8af3..aea8f21d3e1 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,5 +1,9 @@
 2004-11-11  Janis Johnson  <janis187@us.ibm.com>
 
+	* gcc.misc-tests/linkage.exp: Prepend directory name to pass/fail
+	message, delete generated files, use more descriptive name for
+	executable, and make the test unsupported when it cannot be run.
+
 	* lib/gcc-dg.exp (skip_test_and_clear_xfail): New procedure.
 	(dg-require-weak, dg-require-visibility, dg-require-alias,
 	dg-require-gc-sections, dg-require-profiling, dg-require-dll,
diff --git a/gcc/testsuite/gcc.misc-tests/linkage.exp b/gcc/testsuite/gcc.misc-tests/linkage.exp
index 9c8936db05a..7d4f8e95f03 100644
--- a/gcc/testsuite/gcc.misc-tests/linkage.exp
+++ b/gcc/testsuite/gcc.misc-tests/linkage.exp
@@ -21,7 +21,7 @@
 if [isnative] then {
     set lines [gcc_target_compile "$srcdir/$subdir/linkage-x.c" "linkage-x.o" object {additional_flags="-w"}]
     if ![string match "" $lines] then {
-	fail "linkage.c"
+	fail "$subdir/linkage.c compile"
     } else {
 	# This is a completely bogus test. Sorry.
 
@@ -65,7 +65,9 @@ if [isnative] then {
 	    }
 	}
 
-	catch { exec rm -f linkage-y.o }
+	if [file exists "linkage-y.o"] then {
+	    file delete "linkage-y.o"
+	}
 	send_log "cc -c $native_cflags $srcdir/$subdir/linkage-y.c >&/dev/null\n"
 	catch { exec cc -c $native_cflags "$srcdir/$subdir/linkage-y.c" >&/dev/null }
 	if ![file exists "linkage-y.o"] then {
@@ -73,12 +75,17 @@ if [isnative] then {
 	    catch { exec c89 -c $native_cflags "$srcdir/$subdir/linkage-y.c" >&/dev/null }
 	}
 	if [file exists "linkage-y.o"] then {
-	    set lines [gcc_target_compile "linkage-y.o linkage-x.o" "x" executable ""]
+	    set lines [gcc_target_compile "linkage-y.o linkage-x.o" "linkage.exe" executable ""]
 	    if [string match "" $lines] then {
-		pass "linkage.c"
+		pass "$subdir/linkage.c link"
+		file delete "linkage.exe"
 	    } else {
-		fail "linkage.c"
+		fail "$subdir/linkage.c link"
 	    }
+	    file delete "linkage-y.o"
+	} else {
+	    unsupported "$subdir/linkage.c native compile failed"
 	}
+	file delete "linkage-x.o"
     }
 }
-- 
2.30.2