* lib/gdb.exp (BUILD_DATA_DIRECTORY): New global.

diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog
index 32d5289a844f2b278afe333bb0c81e0c1de57343..23fd940c2061c07bb70ec7f10b7270cfdce75098 100644 (file)
--- a/gdb/testsuite/ChangeLog
+++ b/gdb/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2012-03-23  Doug Evans  <dje@google.com>
+
+       * lib/gdb.exp (BUILD_DATA_DIRECTORY): New global.
+
 2012-03-22  Siva Chandra Reddy  <sivachandra@google.com>
 
        * gdb.python/py-value.cc: Add test case for testing the

diff --git a/gdb/testsuite/lib/gdb.exp b/gdb/testsuite/lib/gdb.exp
index 7287ed3257add3f0a411035758bb25ccb4e32de2..ccf5e987dfb7bc8ff304c45006598728d641e70b 100644 (file)
--- a/gdb/testsuite/lib/gdb.exp
+++ b/gdb/testsuite/lib/gdb.exp
@@ -52,10 +52,13 @@ if ![info exists GDBFLAGS] {
 }
 verbose "using GDBFLAGS = $GDBFLAGS" 2
 
+# Make the build data directory available to tests.
+set BUILD_DATA_DIRECTORY "[pwd]/../data-directory"
+
 # INTERNAL_GDBFLAGS contains flags that the testsuite requires.
 global INTERNAL_GDBFLAGS
 if ![info exists INTERNAL_GDBFLAGS] {
-    set INTERNAL_GDBFLAGS "-nw -nx -data-directory [pwd]/../data-directory"
+    set INTERNAL_GDBFLAGS "-nw -nx -data-directory $BUILD_DATA_DIRECTORY"
 }
 
 # The variable gdb_prompt is a regexp which matches the gdb prompt.