Tested x86_64-linux. Pushed to trunk.
-- >8 --
Also fix the name of a source file used by an effective target check.
libstdc++-v3/ChangeLog:
* testsuite/config/default.exp: Remove trailing whitespace.
* testsuite/lib/dg-options.exp: Likewise.
* testsuite/lib/prune.exp: Likewise.
* testsuite/libstdc++-abi/abi.exp: Likewise.
* testsuite/libstdc++-dg/conformance.exp: Likewise.
* testsuite/libstdc++-prettyprinters/prettyprinters.exp:
Likewise.
* testsuite/libstdc++-xmethods/xmethods.exp: Likewise.
* testsuite/lib/libstdc++.exp: Likewise.
(check_v3_target_c_std): Fix filename for temporary source file.
---
libstdc++-v3/testsuite/config/default.exp | 4 ++--
libstdc++-v3/testsuite/lib/dg-options.exp | 4 ++--
libstdc++-v3/testsuite/lib/libstdc++.exp | 8 ++++----
libstdc++-v3/testsuite/lib/prune.exp | 4 ++--
libstdc++-v3/testsuite/libstdc++-abi/abi.exp | 6 +++---
.../testsuite/libstdc++-dg/conformance.exp | 15 ++++++++-------
.../libstdc++-prettyprinters/prettyprinters.exp | 4 ++--
.../testsuite/libstdc++-xmethods/xmethods.exp | 4 ++--
8 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/libstdc++-v3/testsuite/config/default.exp
b/libstdc++-v3/testsuite/config/default.exp
index 6c5b57bd26f..a50f1dfe1ab 100644
--- a/libstdc++-v3/testsuite/config/default.exp
+++ b/libstdc++-v3/testsuite/config/default.exp
@@ -6,12 +6,12 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
diff --git a/libstdc++-v3/testsuite/lib/dg-options.exp
b/libstdc++-v3/testsuite/lib/dg-options.exp
index 15e34f8a646..7ee32fbbf71 100644
--- a/libstdc++-v3/testsuite/lib/dg-options.exp
+++ b/libstdc++-v3/testsuite/lib/dg-options.exp
@@ -6,12 +6,12 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp
b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 9f3e896751a..271f8772caf 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -6,12 +6,12 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
@@ -808,8 +808,8 @@ proc check_v3_target_c_std { } {
# Set up, compile, and execute a C++ test program that tries to use
# C99 functionality.
# For math bits, could use check_effective_target_c99_math.
- set src fileio[pid].cc
- set exe fileio[pid].x
+ set src c_std[pid].cc
+ set exe c_std[pid].x
set f [open $src "w"]
puts $f "#include <tr1/cmath>"
diff --git a/libstdc++-v3/testsuite/lib/prune.exp
b/libstdc++-v3/testsuite/lib/prune.exp
index be6d16c26e5..b4abb93294a 100644
--- a/libstdc++-v3/testsuite/lib/prune.exp
+++ b/libstdc++-v3/testsuite/lib/prune.exp
@@ -4,12 +4,12 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
diff --git a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp
b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp
index 6b39c7863d2..e453234e768 100644
--- a/libstdc++-v3/testsuite/libstdc++-abi/abi.exp
+++ b/libstdc++-v3/testsuite/libstdc++-abi/abi.exp
@@ -4,12 +4,12 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
@@ -26,7 +26,7 @@ gcc_parallel_test_enable 0
if { [string match "*-*-darwin*" $target_triplet] } {
set lib $blddir/src/.libs/libstdc++.dylib
-} else {
+} else {
set lib $blddir/src/.libs/libstdc++.so
}
diff --git a/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp
b/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp
index e8c6504a7f7..32d6f69fe89 100644
--- a/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp
+++ b/libstdc++-v3/testsuite/libstdc++-dg/conformance.exp
@@ -6,12 +6,12 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
@@ -21,6 +21,7 @@
# Initialization.
dg-init
+
# Build the support objects.
v3-build_support
@@ -48,7 +49,7 @@ if {[info exists tests_file] && [file exists $tests_file]} {
if { [string length "$t"] != 0 } {
lappend tests ${srcdir}/${t}
}
- }
+ }
close $f
} else {
# Find directories that might have tests.
@@ -76,7 +77,7 @@ if {[info exists tests_file] && [file exists $tests_file]} {
# Filter out tests that should not be run.
foreach t $subdir_tests {
- # The DejaGNU "find" procedure sometimes returns a list
+ # The DejaGNU "find" procedure sometimes returns a list
# containing an empty string, when it should really return
# an empty list.
if { $t == "" } {
@@ -87,13 +88,13 @@ if {[info exists tests_file] && [file exists $tests_file]} {
# 1. interactive tests.
# 2. performance tests.
# 3. wchar_t tests, if not supported.
- # 4. thread tests, if not supported.
+ # 4. thread tests, if not supported.
# 5. *_filebuf, if file I/O is not supported.
# 6. simd tests.
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-wchar_t} || [string first wchar_t $t] == -1)
+ && (${v3-threads} || [string first thread $t] == -1)
&& ([string first "_filebuf" $t] == -1
|| [check_v3_target_fileio])
&& [string first "/experimental/simd/" $t] == -1 } {
diff --git a/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp
b/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp
index 73249865b93..ace3c44ee48 100644
--- a/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp
+++ b/libstdc++-v3/testsuite/libstdc++-prettyprinters/prettyprinters.exp
@@ -4,12 +4,12 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
diff --git a/libstdc++-v3/testsuite/libstdc++-xmethods/xmethods.exp
b/libstdc++-v3/testsuite/libstdc++-xmethods/xmethods.exp
index 59d12a70764..7344c577567 100644
--- a/libstdc++-v3/testsuite/libstdc++-xmethods/xmethods.exp
+++ b/libstdc++-v3/testsuite/libstdc++-xmethods/xmethods.exp
@@ -4,12 +4,12 @@
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 3 of the License, or
# (at your option) any later version.
-#
+#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
-#
+#
# You should have received a copy of the GNU General Public License
# along with this program; see the file COPYING3. If not see
# <http://www.gnu.org/licenses/>.
--
2.41.0
