gcc/

2006-01-10  H.J. Lu  <hongjiu.lu@intel.com>

	PR testsuite/25741
	* Makefile.in (check-%): Depend on site.exp instead of
	$(TESTSUITEDIR)/site.exp. Run "runtest" in separate language
	directories.

gcc/testsuite/

2006-01-10  H.J. Lu  <hongjiu.lu@intel.com>

	PR testsuite/25741
	* lib/g++.exp (g++_init): Use $base_dir/../../ instead of
	$base_dir/../.
	* lib/g77.exp (g77_init): Likewise.
	* lib/scanasm.exp (scan-assembler-dem): Likewise.
	(scan-assembler-dem-not): Likewise.

--- gcc/Makefile.in.ppp	2006-01-09 12:10:28.000000000 -0800
+++ gcc/Makefile.in	2006-01-10 23:21:39.000000000 -0800
@@ -3238,10 +3238,16 @@ $(TESTSUITEDIR)/site.exp: site.exp
 	-rm -f $@
 	sed '/set tmpdir/ s|testsuite|$(TESTSUITEDIR)|' < site.exp > $@
 
-$(lang_checks): check-% : $(TESTSUITEDIR)/site.exp
+$(lang_checks): check-% : site.exp
+	test -d $(TESTSUITEDIR) || mkdir $(TESTSUITEDIR)
+	test -d $(TESTSUITEDIR)/$* || mkdir $(TESTSUITEDIR)/$*
 	-(rootme=`${PWD_COMMAND}`; export rootme; \
 	srcdir=`cd ${srcdir}; ${PWD_COMMAND}` ; export srcdir ; \
-	cd $(TESTSUITEDIR); \
+	cd $(TESTSUITEDIR)/$*; \
+	rm -f tmp-site.exp; \
+	sed '/set tmpdir/ s|testsuite|$(TESTSUITEDIR)/$*|' \
+		< ../../site.exp > tmp-site.exp; \
+	$(SHELL) $(srcdir)/../move-if-change tmp-site.exp site.exp; \
 	EXPECT=${EXPECT} ; export EXPECT ; \
 	if [ -f $${rootme}/../expect/expect ] ; then  \
 	   TCL_LIBRARY=`cd .. ; cd ${srcdir}/../tcl/library ; ${PWD_COMMAND}` ; \
--- gcc/testsuite/lib/g++.exp.ppp	2005-11-04 14:24:35.000000000 -0800
+++ gcc/testsuite/lib/g++.exp	2006-01-10 23:21:40.000000000 -0800
@@ -183,7 +183,7 @@ proc g++_init { args } {
 	    if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } {
 		set GXX_UNDER_TEST [transform c++]
 	    } else {
-		set GXX_UNDER_TEST [findfile $base_dir/../g++ "$base_dir/../g++ -B$base_dir/../" [findfile $base_dir/g++ "$base_dir/g++ -B$base_dir/" [transform c++]]]
+		set GXX_UNDER_TEST [findfile $base_dir/../../g++ "$base_dir/../../g++ -B$base_dir/../../" [findfile $base_dir/g++ "$base_dir/g++ -B$base_dir/" [transform c++]]]
 	    }
 	}
     }
--- gcc/testsuite/lib/g77.exp.ppp	2005-11-04 14:24:35.000000000 -0800
+++ gcc/testsuite/lib/g77.exp	2006-01-10 23:22:14.000000000 -0800
@@ -149,7 +149,7 @@ proc g77_init { args } {
 	    if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } {
 		set G77_UNDER_TEST [transform g77]
 	    } else {
-		set G77_UNDER_TEST [findfile $base_dir/../g77 "$base_dir/../g77 -B$base_dir/../" [findfile $base_dir/g77 "$base_dir/g77 -B$base_dir/" [transform g77]]]
+		set G77_UNDER_TEST [findfile $base_dir/../../g77 "$base_dir/../../g77 -B$base_dir/../../" [findfile $base_dir/g77 "$base_dir/g77 -B$base_dir/" [transform g77]]]
 	    }
 	}
     }
--- gcc/testsuite/lib/scanasm.exp.ppp	2005-11-04 14:24:35.000000000 -0800
+++ gcc/testsuite/lib/scanasm.exp	2006-01-10 23:21:46.000000000 -0800
@@ -157,9 +157,9 @@ proc scan-assembler-dem { args } {
 
     # Find c++filt like we find g++ in g++.exp.
     if ![info exists cxxfilt]  {
-	set cxxfilt [findfile $base_dir/../../binutils/cxxfilt \
-		     $base_dir/../../binutils/cxxfilt \
-	             [findfile $base_dir/../c++filt $base_dir/../c++filt \
+	set cxxfilt [findfile $base_dir/../../../binutils/cxxfilt \
+		     $base_dir/../../../binutils/cxxfilt \
+	             [findfile $base_dir/../../c++filt $base_dir/../../c++filt \
 		      [findfile $base_dir/c++filt $base_dir/c++filt \
 		       [transform c++filt]]]]
 	verbose -log "c++filt is $cxxfilt"
@@ -203,9 +203,9 @@ proc scan-assembler-dem-not { args } {
 
     # Find c++filt like we find g++ in g++.exp.
     if ![info exists cxxfilt]  {
-	set cxxfilt [findfile $base_dir/../../binutils/cxxfilt \
-		     $base_dir/../../binutils/cxxfilt \
-		     [findfile $base_dir/../c++filt $base_dir/../c++filt \
+	set cxxfilt [findfile $base_dir/../../../binutils/cxxfilt \
+		     $base_dir/../../../binutils/cxxfilt \
+		     [findfile $base_dir/../../c++filt $base_dir/../../c++filt \
 		      [findfile $base_dir/c++filt $base_dir/c++filt \
 		       [transform c++filt]]]]
 	verbose -log "c++filt is $cxxfilt"