This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]
Other format: [Raw text]

[patch] fix ld_library_path in the testsuites with multilib dirnames containing a '_'


If a multlib dirname contains a '_', the dejagnu scripts fail to add
the multilib dir to the ld_library_path when running the testsuites.
Bootstrapped a multilib build, run the check target. Ok to check in?

  Matthias


2006-04-02  Matthias Klose  <doko@debian.org>

	* testsuite/lib/<name>.exp (<name>_init): Recognize multilib
	directory names containing underscores.

"same" changelog entry for the other files.

--- libgomp/testsuite/lib/libgomp-dg.exp~	2006-02-10 00:14:13.000000000 +0100
+++ libgomp/testsuite/lib/libgomp-dg.exp	2006-04-02 12:10:32.143386992 +0200
@@ -107,7 +107,7 @@
 	if { [is_remote host] == 0 && [which $compiler] != 0 } {
 	  foreach i "[exec $compiler --print-multi-lib]" {
 	    set mldir ""
-	    regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
+	    regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
 	    set mldir [string trimright $mldir "\;@"]
 	    if { "$mldir" == "." } {
 	      continue
--- gcc/testsuite/lib/gcc-defs.exp~	2006-01-18 22:42:59.000000000 +0100
+++ gcc/testsuite/lib/gcc-defs.exp	2006-04-02 12:11:35.571744416 +0200
@@ -238,7 +238,7 @@
     if { [is_remote host] == 0 && [which $compiler] != 0 } {
 	foreach i "[exec $compiler --print-multi-lib]" {
 	    set mldir ""
-	    regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
+	    regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
 	    set mldir [string trimright $mldir "\;@"]
 	    if { "$mldir" == "." } {
 		continue
--- libstdc++-v3/testsuite/lib/libstdc++.exp~	2006-03-25 09:16:05.000000000 +0100
+++ libstdc++-v3/testsuite/lib/libstdc++.exp	2006-04-02 12:06:37.591044368 +0200
@@ -150,7 +150,7 @@
 	if { [is_remote host] == 0 && [which $compiler] != 0 } {
 	  foreach i "[exec $compiler --print-multi-lib]" {
 	    set mldir ""
-	    regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
+	    regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
 	    set mldir [string trimright $mldir "\;@"]
 	    if { "$mldir" == "." } {
 	      continue
--- libmudflap/testsuite/lib/libmudflap.exp~	2006-01-18 22:49:11.000000000 +0100
+++ libmudflap/testsuite/lib/libmudflap.exp	2006-04-02 12:05:53.624728264 +0200
@@ -69,7 +69,7 @@
     if {[is_remote host] == 0} {
 	foreach i "[exec ${gccdir}/xgcc --print-multi-lib]" {
 	    set mldir ""
-	    regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
+	    regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
 	    set mldir [string trimright $mldir "\;@"]
 	    if { "$mldir" == "." } {
 		continue
--- libffi/testsuite/lib/libffi-dg.exp~	2006-01-18 22:49:31.000000000 +0100
+++ libffi/testsuite/lib/libffi-dg.exp	2006-04-02 12:10:54.352010768 +0200
@@ -120,7 +120,7 @@
     if { [is_remote host] == 0 && [which $compiler] != 0 } {
 	foreach i "[exec $compiler --print-multi-lib]" {
 	    set mldir ""
-	    regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
+	    regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
 	    set mldir [string trimright $mldir "\;@"]
 	    if { "$mldir" == "." } {
 		continue
--- libjava/testsuite/lib/libjava.exp~	2006-01-18 22:52:22.000000000 +0100
+++ libjava/testsuite/lib/libjava.exp	2006-04-02 12:11:16.117701880 +0200
@@ -212,7 +212,7 @@
 	if { [is_remote host] == 0 && [which $compiler] != 0 } {
 	    foreach i "[exec $compiler --print-multi-lib]" {
 		set mldir ""
-		regexp -- "\[a-z0-9=/\.-\]*;" $i mldir
+		regexp -- "\[a-z0-9=_/\.-\]*;" $i mldir
 		set mldir [string trimright $mldir "\;@"]
 		if { "$mldir" == "." } {
 		    continue


Index Nav: [Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav: [Date Prev] [Date Next] [Thread Prev] [Thread Next]