Re: [testsuite] setting sysroot for target-board

[Wei-cheng Wang <cole945@gmail.com>]

On Fri, May 6, 2011 at 5:47 PM, Pedro Alves <pedro@codesourcery.com> wrote:
> On Friday 06 May 2011 03:24:08, Wei-cheng Wang wrote:
> Doing this here assumes you'll only need the sysroot after connecting.
> How have you tested this?  It seems you forgot the MI equivalent.
Yes, I did test it.
I found this issue when I tested gdb/gdbserver with a remote
cross-target. Some thread- and shared library-related test cases
failed due to using the wrong shared libraries for the host, so I
tried to add sysroot support and I’ve tested it again to make sure gdb
will use the right shared libraries for the target.
> I think a better place would be right after spawning
> gdb (default_gdb_start/default_mi_gdb_start).  If since you
> already have a board file anyway, you could also override *gdb_start
> and do it there instead of adding a new flag.
I agree. It’s better to put this in default_gdb_start/default_mi_gdb_start.
Since these two functions are not just a few of lines,
I will suggest adding this support, so it much easier to set sysroot as needed.
And here is the update according to your suggestion. Thanks.
- - - -
2011-05-06  Wei-cheng Wang <cole945@gmail.com>

        * lib/gdb.exp (default_gdb_start): Add support for setting sysroot for
        target system.
        * lib/mi-support.exp (default_mi_gdb_start): Likewise.

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 20e2fb7..c6fa62d 100644
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -1349,6 +1349,18 @@ proc default_gdb_start { } {
 	    warning "Couldn't set the width to 0."
 	}
     }
+
+    if [target_info exists gdb,sysroot] {
+        send_gdb "set sysroot [target_info gdb,sysroot]\n"
+        gdb_expect 10 {
+	    -re "$gdb_prompt $" {
+	        verbose "Setting sysroot to [target_info gdb,sysroot]" 2
+	    }
+	    timeout {
+                warning "Couldn't set the sysroot to [target_info gdb,sysroot]"
+	    }
+        }
+    }
     return 0;
 }

diff --git a/gdb/testsuite/lib/mi-support.exp b/gdb/testsuite/lib/mi-support.exp
index e1dbd19..15565bc 100644
--- a/gdb/testsuite/lib/mi-support.exp
+++ b/gdb/testsuite/lib/mi-support.exp
@@ -221,6 +221,17 @@ proc default_mi_gdb_start { args } {
 	    }
     	}
     }
+    if [target_info exists gdb,sysroot] {
+    send_gdb "103-gdb-set sysroot [target_info gdb,sysroot]\n"
+        gdb_expect 10 {
+	    -re ".*103-gdb-set sysroot [target_info
gdb,sysroot]\r\n103\\\^done\r\n$mi_gdb_prompt$" {
+	        verbose "Setting sysroot to [target_info gdb,sysroot]" 2
+	    }
+	    timeout {
+	        warning "Couldn't set the sysroot to [target_info gdb,sysroot]."
+	    }
+        }
+    }

     detect_async