aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/Makefile.in10
-rw-r--r--gcc/testsuite/ChangeLog12
-rw-r--r--gcc/testsuite/lib/g++.exp2
-rw-r--r--gcc/testsuite/lib/gfortran.exp2
-rw-r--r--gcc/testsuite/lib/obj-c++.exp2
-rw-r--r--gcc/testsuite/lib/scanasm.exp12
-rw-r--r--gcc/testsuite/lib/scandump.exp12
8 files changed, 42 insertions, 17 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 62dc8ff..c1775ce 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2006-01-16 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.
+
2006-01-16 Kazu Hirata <kazu@codesourcery.com>
* global.c (global_alloc): Make it static.
diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 7a6495e..8338ac6 100644
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3997,10 +3997,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}` ; \
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 7d4d586..498e6d3 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,15 @@
+2006-01-16 H.J. Lu <hongjiu.lu@intel.com>
+
+ PR testsuite/25741
+ * lib/g++.exp (g++_init): Use $base_dir/../../ instead of
+ $base_dir/../.
+ * lib/gfortran.exp (gfortran_init): Likewise.
+ * lib/obj-c++.exp (obj-c++_init): Likewise.
+ * lib/scanasm.exp (scan-assembler-dem): Likewise.
+ (scan-assembler-dem-not): Likewise.
+ * lib/scandump.exp (scan-dump-dem): Likewise.
+ (scan-dump-dem-not): Likewise.
+
2006-01-16 Andrew Pinski <pinskia@physics.uc.edu>
PR testsuite/25767
diff --git a/gcc/testsuite/lib/g++.exp b/gcc/testsuite/lib/g++.exp
index 0320505..700cc58 100644
--- a/gcc/testsuite/lib/g++.exp
+++ b/gcc/testsuite/lib/g++.exp
@@ -197,7 +197,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++]]]
}
}
}
diff --git a/gcc/testsuite/lib/gfortran.exp b/gcc/testsuite/lib/gfortran.exp
index 435d715..92a0641 100644
--- a/gcc/testsuite/lib/gfortran.exp
+++ b/gcc/testsuite/lib/gfortran.exp
@@ -137,7 +137,7 @@ proc gfortran_init { args } {
if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } {
set GFORTRAN_UNDER_TEST [transform gfortran]
} else {
- set GFORTRAN_UNDER_TEST [findfile $base_dir/../gfortran "$base_dir/../gfortran -B$base_dir/../" [findfile $base_dir/gfortran "$base_dir/gfortran -B$base_dir/" [transform gfortran]]]
+ set GFORTRAN_UNDER_TEST [findfile $base_dir/../../gfortran "$base_dir/../../gfortran -B$base_dir/../../" [findfile $base_dir/gfortran "$base_dir/gfortran -B$base_dir/" [transform gfortran]]]
}
}
}
diff --git a/gcc/testsuite/lib/obj-c++.exp b/gcc/testsuite/lib/obj-c++.exp
index 74c5229..8913b31 100644
--- a/gcc/testsuite/lib/obj-c++.exp
+++ b/gcc/testsuite/lib/obj-c++.exp
@@ -215,7 +215,7 @@ proc obj-c++_init { args } {
if { [is_remote host] || ! [info exists TESTING_IN_BUILD_TREE] } {
set OBJCXX_UNDER_TEST [transform c++]
} else {
- set OBJCXX_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 OBJCXX_UNDER_TEST [findfile $base_dir/../../g++ "$base_dir/../../g++ -B$base_dir/../../" [findfile $base_dir/g++ "$base_dir/g++ -B$base_dir/" [transform c++]]]
}
}
}
diff --git a/gcc/testsuite/lib/scanasm.exp b/gcc/testsuite/lib/scanasm.exp
index a62d1a6..932977b 100644
--- a/gcc/testsuite/lib/scanasm.exp
+++ b/gcc/testsuite/lib/scanasm.exp
@@ -203,9 +203,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"
@@ -249,9 +249,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"
diff --git a/gcc/testsuite/lib/scandump.exp b/gcc/testsuite/lib/scandump.exp
index c968a8c..db69a9d 100644
--- a/gcc/testsuite/lib/scandump.exp
+++ b/gcc/testsuite/lib/scandump.exp
@@ -149,9 +149,9 @@ proc scan-dump-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"
@@ -193,9 +193,9 @@ proc scan-dump-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"
generated by cgit v1.1 at 2024-11-07 02:28:24 +0000