aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHans-Peter Nilsson <hp@axis.com>2010-10-07 21:44:36 +0000
committerHans-Peter Nilsson <hp@gcc.gnu.org>2010-10-07 21:44:36 +0000
commit38851a969d70820c9519bf99e569e1da0a55ffe6 (patch)
tree4c7e981690fac669c3c33fa82a74a864bc0d1ff8
parent39604ffed72a746fa68dfe473b4531750452bf61 (diff)
downloadgcc-38851a969d70820c9519bf99e569e1da0a55ffe6.zip
gcc-38851a969d70820c9519bf99e569e1da0a55ffe6.tar.gz
gcc-38851a969d70820c9519bf99e569e1da0a55ffe6.tar.bz2
conformance.exp: Apply check_v3_target_fileio as a gate for tests in subdirectories matching the...
* testsuite/libstdc++-dg/conformance.exp: Apply check_v3_target_fileio as a gate for tests in subdirectories matching the substring _filebuf. From-SVN: r165135
-rw-r--r--libstdc++-v3/ChangeLog6
-rw-r--r--libstdc++-v3/testsuite/libstdc++-dg/conformance.exp7
2 files changed, 11 insertions, 2 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7b4750c..99c840d 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2010-10-07 Hans-Peter Nilsson <hp@axis.com>
+
+ * testsuite/libstdc++-dg/conformance.exp: Apply
+ check_v3_target_fileio as a gate for tests in
+ subdirectories matching the substring _filebuf.
+
2010-10-07 Paolo Carlini <paolo.carlini@oracle.com>
* include/bits/locale_facets_nonio.tcc (time_get<>::
diff --git a/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp b/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp
index ae33949..8642eb7 100644
--- a/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp
+++ b/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp
@@ -1,6 +1,6 @@
# Functional and regression tests in C++ for libstdc++.
-# Copyright (C) 2001, 2002, 2003, 2004, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2004, 2009, 2010 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -83,10 +83,13 @@ if {[info exists tests_file] && [file exists $tests_file]} {
# 2. performance tests.
# 3. wchar_t tests, if not supported.
# 4. thread tests, if not supported.
+ # 5. *_filebuf, if file I/O is 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) } {
+ && (${v3-threads} || [string first thread $t] == -1)
+ && ([string first "_filebuf" $t] == -1
+ || [check_v3_target_fileio]) } {
lappend tests $t
}
}