git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

normal.exp: Read testsuite_files, if it exists. 

* testsuite/libstdc++-dg/normal.exp: Read testsuite_files, if it
	exists.

From-SVN: r96980
This commit is contained in:
Mark Mitchell 2005-03-24 04:26:30 +00:00 committed by Mark Mitchell
parent 97e095fdc7
commit a53ed3ded7
2 changed files with 57 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libstdc++-v3/ChangeLog
View File

@ -1,5 +1,8 @@
2005-03-23 Mark Mitchell <mark@codesourcery.com> 2005-03-23 Mark Mitchell <mark@codesourcery.com>
* testsuite/libstdc++-dg/normal.exp: Read testsuite_files, if it
exists.
* testsuite/lib/libstdc++.exp (libstdc++_wchar_t): Rename to ... * testsuite/lib/libstdc++.exp (libstdc++_wchar_t): Rename to ...
(v3-wchar_t): ... this. (v3-wchar_t): ... this.
(libstdc++_threads): Rename to ... (libstdc++_threads): Rename to ...

82
libstdc++-v3/testsuite/libstdc++-dg/normal.exp
View File

@ -24,36 +24,62 @@ dg-init
# Build the support objects. # Build the support objects.
v3-build_support v3-build_support
# Find directories that might have tests.
set subdirs [glob "$srcdir/\[0-9\]\[0-9\]*"]
foreach d [glob "$srcdir/\[a-z\]*"] {
if {[file isdirectory $d]} {
lappend subdirs $d
}
}
# Find all the tests.
set tests [list] set tests [list]
foreach s $subdirs {
set subdir_tests [find $s *.cc] # If there is a "testsuite_files" file, use it.
# Filter out tests that should not be run. #
foreach t $subdir_tests { # This is a workaround for problems reported with using:
# The DejaGNU "find" procedure sometimes returns a list #
# containing an empty string, when it should realy return # runtest normal.exp="`cat testsuite_files`"
# an empty list. #
if { $t == "" } { # See:
continue # http://gcc.gnu.org/ml/libstdc++/2005-03/msg00278.html
# for discussion of the problem.
#
# If that worked consistently, we could modify "make check" to
# pass that option, and then remove this code.
if {[info exists blddir]} {
set tests_file "${blddir}/testsuite/testsuite_files"
}
if {[info exists tests_file] && [file exists $tests_file]} {
set f [open $tests_file]
while { ! [eof $f] } {
set t [gets $f]
if { [string length "$t"] != 0 } {
lappend tests ${srcdir}/${t}
} }
# Filter out: }
# 1. interactive tests. close $f
# 2. performance tests. } else {
# 3. wchar_t tests, if not supported. # Find directories that might have tests.
# 4. thread tests, if not supported. set subdirs [glob "$srcdir/\[0-9\]\[0-9\]*"]
if { [string first _xin $t] == -1 foreach d [glob "$srcdir/\[a-z\]*"] {
&& [string first performance $t] == -1 if {[file isdirectory $d]} {
&& (${v3-wchar_t} || [string first wchar_t $t] == -1) lappend subdirs $d
&& (${v3-threads} || [string first thread $t] == -1) } { }
lappend tests $t }
# Find all the tests.
foreach s $subdirs {
set subdir_tests [find $s *.cc]
# Filter out tests that should not be run.
foreach t $subdir_tests {
# The DejaGNU "find" procedure sometimes returns a list
# containing an empty string, when it should really return
# an empty list.
if { $t == "" } {
continue
}
# Filter out:
# 1. interactive tests.
# 2. performance tests.
# 3. wchar_t tests, if not supported.
# 4. thread tests, if not supported.
if { [string first _xin $t] == -1
&& [string first performance $t] == -1
&& (${v3-wchar_t} || [string first wchar_t $t] == -1)
&& (${v3-threads} || [string first thread $t] == -1) } {
lappend tests $t
}
} }
} }
} }