aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMark Mitchell <mark@codesourcery.com>2007-05-07 18:03:47 +0000
committerMark Mitchell <mmitchel@gcc.gnu.org>2007-05-07 18:03:47 +0000
commit7504beb42093014debe1a72c370435c45a95091f (patch)
treed1ae4e22cc289695cfea879a8189f5a7a4bcb1f2
parentb187f5cd2f5fde150807a7cb1a4ca1f643c5078a (diff)
downloadgcc-7504beb42093014debe1a72c370435c45a95091f.zip
gcc-7504beb42093014debe1a72c370435c45a95091f.tar.gz
gcc-7504beb42093014debe1a72c370435c45a95091f.tar.bz2
libstdc++.exp (v3_target_compile_as_c): In installed-tree testing, use "remote_exec host", not "remote_exec exec".
* testsuite/lib/libstdc++.exp (v3_target_compile_as_c): In installed-tree testing, use "remote_exec host", not "remote_exec exec". Trip trailing newlines from output of -dumpversion and -dumpmachine. From-SVN: r124505
-rw-r--r--libstdc++-v3/ChangeLog7
-rw-r--r--libstdc++-v3/testsuite/lib/libstdc++.exp7
2 files changed, 11 insertions, 3 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 7a0a27c..d6b62ca 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,10 @@
+2007-05-07 Mark Mitchell <mark@codesourcery.com>
+
+ * testsuite/lib/libstdc++.exp (v3_target_compile_as_c): In
+ installed-tree testing, use "remote_exec host", not "remote_exec
+ exec". Trip trailing newlines from output of -dumpversion and
+ -dumpmachine.
+
2007-05-07 Benjamin Kosnik <bkoz@redhat.com>
Howard Hinnant <hhinnant@apple.com>
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 70f2cb6..b990f46 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -399,9 +399,10 @@ proc v3_target_compile_as_c { source dest type options } {
# info.
if { ![file exists $flags_file] } {
set version [remote_exec host ${cc} -dumpversion]
- set version [lindex $version 1]
- set machine [remote_exec exec ${cc} -dumpmachine]
- set machine [lindex $machine 1]
+ # Remove the trailing newline from the output.
+ set version [string trimright [lindex $version 1]]
+ set machine [remote_exec host ${cc} -dumpmachine]
+ set machine [string trimright [lindex $machine 1]]
set comp_base_dir [remote_exec host ${cc} --print-prog-name=cc1]
set comp_base_dir [lindex $comp_base_dir 1]
set comp_base_dir [file dirname [file dirname [file dirname [file dirname [file dirname $comp_base_dir]]]]]