From 1152b861f705c8a27743f1622b310eb317ba13ef Mon Sep 17 00:00:00 2001
From: David Billinghurst <David.Billinghurst@riotinto.com>
Date: Mon, 1 Mar 2004 04:30:49 +0000
Subject: [PATCH] libstdc++.exp (v3-list-tests): Use testsuite_files from
correct multilib blddir when running testsuite.
2004-03-01 David Billinghurst <David.Billinghurst@riotinto.com>
* testsuite/lib/libstdc++.exp (v3-list-tests): Use
testsuite_files from correct multilib blddir when running
testsuite.
From-SVN: r78692
---
libstdc++-v3/ChangeLog | 6 ++++++
libstdc++-v3/testsuite/lib/libstdc++.exp | 10 +++++++---
2 files changed, 13 insertions(+), 3 deletions(-)
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog
index 1e508e92bab2..452556545a67 100644
--- a/libstdc++-v3/ChangeLog
+++ b/libstdc++-v3/ChangeLog
@@ -1,3 +1,9 @@
+2004-03-01 David Billinghurst <David.Billinghurst@riotinto.com>
+
+ * testsuite/lib/libstdc++.exp (v3-list-tests): Use
+ testsuite_files from correct multilib blddir when running
+ testsuite.
+
2004-02-29 Phil Edwards <phil@codesourcery.com>
* testsuite/Makefile.am (check-abi, check-abi-verbose): Copy
diff --git a/libstdc++-v3/testsuite/lib/libstdc++.exp b/libstdc++-v3/testsuite/lib/libstdc++.exp
index 12c208851288..e2c8ddd80883 100644
--- a/libstdc++-v3/testsuite/lib/libstdc++.exp
+++ b/libstdc++-v3/testsuite/lib/libstdc++.exp
@@ -306,11 +306,15 @@ proc v3_target_compile { source dest type options } {
# Called once, from libstdc++/normal.exp.
proc v3-list-tests { filename } {
global srcdir
- global outdir
-
- set tests_file "${outdir}/${filename}"
+ global blddir
+
+ set tests_file "${blddir}/testsuite/${filename}"
set sfiles ""
+ verbose -log "In v3-list-tests"
+ verbose -log "blddir = ${blddir}"
+ verbose -log "tests_file = $tests_file"
+
# If there is a testsuite_file, use it.
if { [file exists $tests_file] } {
set f [open $tests_file]
--
GitLab