re PR testsuite/21164 (libjava tests uses absolute paths)

	libjava:
	PR testsuite/21164
	* testsuite/lib/libjava.exp: Load dg.exp.
	* testsuite/libjava.jar/jar.exp (gcj_jar_interpret): Strip srcdir
	from jarfile.
	Use result for messages.
	* testsuite/libjava.loader/loader.exp (gcj_loader_test_one): Pass
	errname to libjava_invoke, fix testname.

	gcc:
	PR testsuite/21164
	* lib/compat.exp (compat-execute): Declare unsupported after
	stripping path from src1.
	* lib/lto.exp (lto-execute): Likewise.

From-SVN: r172302

3 files changed, 31 insertions, 24 deletions

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 6d65759..91c792f 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,10 @@
+2011-04-12  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
+
+	PR testsuite/21164
+	* lib/compat.exp (compat-execute): Declare unsupported after
+	stripping path from src1.
+	* lib/lto.exp (lto-execute): Likewise.
+
 2011-04-12  Jakub Jelinek  <jakub@redhat.com>
 
 	PR c/48552
diff --git a/gcc/testsuite/lib/compat.exp b/gcc/testsuite/lib/compat.exp
index 3ce3221..d686631 100644
--- a/gcc/testsuite/lib/compat.exp
+++ b/gcc/testsuite/lib/compat.exp
@@ -1,4 +1,4 @@
-# Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008
+# Copyright (C) 2002, 2003, 2004, 2005, 2007, 2008, 2011
 # Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
@@ -260,13 +260,6 @@ proc compat-execute { src1 sid use_alt } {
     set dg-do-what [list ${dg-do-what-default} "" P]
     set extra_flags_1 [compat-get-options-main $src1]
 
-    # Check whether this test is supported for this target.
-    if { [lindex ${dg-do-what} 1 ] == "N" } {
-	unsupported "$src1"
-	verbose "$src1 not supported on this target, skipping it" 3
-	return
-    }
-
     # Set up the names of the other source files.
     set dir [file dirname $src1]
     set ext [file extension $src1]
@@ -314,10 +307,6 @@ proc compat-execute { src1 sid use_alt } {
 	set testcase [string range "$testcase" [string length "$tmpdir/"] end]
 	set testcase "tmpdir-$testcase"
     }
-    regsub "_main.*" $testcase "" testcase
-    # Set up the base name of executable files so they'll be unique.
-    regsub -all "\[./\]" $testcase "-" execbase
-
     # If we couldn't rip $srcdir out of `src1' then just do the best we can.
     # The point is to reduce the unnecessary noise in the logs.  Don't strip
     # out too much because different testcases with the same name can confuse
@@ -326,6 +315,17 @@ proc compat-execute { src1 sid use_alt } {
         set testcase "[file tail [file dirname $src1]]/[file tail $src1]"
     }
 
+    # Check whether this test is supported for this target.
+    if { [lindex ${dg-do-what} 1 ] == "N" } {
+	unsupported "$testcase"
+	verbose "$testcase not supported on this target, skipping it" 3
+	return
+    }
+
+    regsub "_main.*" $testcase "" testcase
+    # Set up the base name of executable files so they'll be unique.
+    regsub -all "\[./\]" $testcase "-" execbase
+
     # Loop through all of the option lists used for this test.
 
     set count 0
diff --git a/gcc/testsuite/lib/lto.exp b/gcc/testsuite/lib/lto.exp
index f4469ee..762dbbf 100644
--- a/gcc/testsuite/lib/lto.exp
+++ b/gcc/testsuite/lib/lto.exp
@@ -418,13 +418,6 @@ proc lto-execute { src1 sid } {
 	set lto_option_list $LTO_OPTIONS
     }
 
-    # Check whether this test is supported for this target.
-    if { [lindex ${dg-do-what} 1 ] == "N" } {
-	unsupported "$src1"
-	verbose "$src1 not supported on this target, skipping it" 3
-	return
-    }
-
     # Set up the names of the other source files.
     set dir [file dirname $src1]
     set base [file rootname $src1]
@@ -478,11 +471,6 @@ proc lto-execute { src1 sid } {
 	set testcase [string range "$testcase" [string length "$tmpdir/"] end]
 	set testcase "tmpdir-$testcase"
     }
-    regsub "_0.*" $testcase "" testcase
-
-    # Set up the base name of executable files so they'll be unique.
-    regsub -all "\[./\]" $testcase "-" execbase
-
     # If we couldn't rip $srcdir out of `src1' then just do the best we can.
     # The point is to reduce the unnecessary noise in the logs.  Don't strip
     # out too much because different testcases with the same name can confuse
@@ -491,6 +479,18 @@ proc lto-execute { src1 sid } {
         set testcase "[file tail [file dirname $src1]]/[file tail $src1]"
     }
 
+    # Check whether this test is supported for this target.
+    if { [lindex ${dg-do-what} 1 ] == "N" } {
+	unsupported "$testcase"
+	verbose "$testcase not supported on this target, skipping it" 3
+	return
+    }
+
+    regsub "_0.*" $testcase "" testcase
+
+    # Set up the base name of executable files so they'll be unique.
+    regsub -all "\[./\]" $testcase "-" execbase
+
     # Loop through all of the option lists used for this test.
     set count 0
     foreach option $lto_option_list {