Skip to content

R
riscv-gcc-1
Commit fea4cfe0 by H.J. Lu Committed by H.J. Lu
Options

re PR testsuite/25741 (Gcc testsuite isn't parallel build safe) 

gcc/

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.

gcc/testsuite/

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.

From-SVN: r109773
parent 03fb7a05
Showing with 42 additions and 17 deletions
gcc/ChangeLog
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.
......
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}` ; \
......
gcc/testsuite/ChangeLog
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
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++]]]
}
}
}
......
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]]]
}
}
}
......
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++]]]
}
}
}
......
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"
......
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"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment