[Bash-completion-commits] [SCM] bash-completion branch, master, updated. de51dd3a89016453f765820b93af73bd80ad78cc

Freddy Vulto fvulto at gmail.com
Fri Nov 5 20:31:19 UTC 2010


The following commit has been merged in the master branch:
commit de51dd3a89016453f765820b93af73bd80ad78cc
Author: Freddy Vulto <fvulto at gmail.com>
Date:   Fri Nov 5 21:28:48 2010 +0100

    (testsuite) Prepend relative files with $::srcdir
    in an attempt to be able to run the tests successfully from within
    autotools' `make distcheck'.

diff --git a/test/lib/completion.exp b/test/lib/completion.exp
index b7563af..88e92d5 100644
--- a/test/lib/completion.exp
+++ b/test/lib/completion.exp
@@ -1,4 +1,4 @@
-source ${srcdir}/lib/library.exp
+source $::srcdir/lib/library.exp
 
 
 proc completion_exit {} {
diff --git a/test/lib/library.exp b/test/lib/library.exp
index bc5de50..c69aa2b 100644
--- a/test/lib/library.exp
+++ b/test/lib/library.exp
@@ -858,8 +858,8 @@ proc start_bash {} {
     set TESTDIR [pwd]
     # If `--tool_exec' option not specified, use "bash"
     if {! [info exists TOOL_EXECUTABLE]} {set TOOL_EXECUTABLE bash}
-    exp_spawn $TOOL_EXECUTABLE --rcfile config/bashrc
-    assert_bash_exec {} "$TOOL_EXECUTABLE --rcfile config/bashrc"
+    exp_spawn $TOOL_EXECUTABLE --rcfile $::srcdir/config/bashrc
+    assert_bash_exec {} "$TOOL_EXECUTABLE --rcfile $::srcdir/config/bashrc"
     # Bash < 3.2.41 has a bug where 'history' disappears from SHELLOPTS
     # whenever a shopt setting is sourced or eval'ed.  Disabling 'history'
     # makes it not show in tests "Environment should not be modified"
diff --git a/test/lib/unit.exp b/test/lib/unit.exp
index 935997b..e113e1b 100644
--- a/test/lib/unit.exp
+++ b/test/lib/unit.exp
@@ -1,4 +1,4 @@
-source lib/library.exp
+source $::srcdir/lib/library.exp
 
 
 proc unit_exit {} {

-- 
bash-completion



More information about the Bash-completion-commits mailing list