monotone-commits-diffs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Monotone-commits-diffs] net.venge.monotone: ca20099b1244b1c0c828ad7608


From: code
Subject: [Monotone-commits-diffs] net.venge.monotone: ca20099b1244b1c0c828ad7608b5c5d18bc92b4e
Date: Fri, 18 Feb 2011 20:54:17 +0100 (CET)

revision:            ca20099b1244b1c0c828ad7608b5c5d18bc92b4e
date:                2011-02-08T03:02:41
author:              address@hidden
branch:              net.venge.monotone
changelog:
* test/src/tester.cc (main): fix help string; * 
test/extra/bash_completion/library.exp: don't run ~/.bash_profile

manifest:
format_version "1"

new_manifest [87774ec5f5830381e0c5a81cd559f4d567723d7d]

old_revision [540b596407d150d5048a620ea7bbc853c134ea35]

patch "test/extra/bash_completion/library.exp"
 from [106bcb86f31d51d9143a893c3ed19ea83e4d24b6]
   to [141bcb762d316eeffaa104d914caa31038480339]

patch "test/src/tester.cc"
 from [acaadc933bb12e50e8d7ef310678c2fcaf2243bf]
   to [98ee04487bc08d905de66ea4bd335417d4bfaeef]
============================================================
--- test/src/tester.cc	acaadc933bb12e50e8d7ef310678c2fcaf2243bf
+++ test/src/tester.cc	98ee04487bc08d905de66ea4bd335417d4bfaeef
@@ -914,7 +914,7 @@ int main(int argc, char **argv)
 
       if (want_help || need_help)
         {
-          P(F("Usage: %s test-file testsuite [options] [tests]\n") % argv[0]);
+          P(F("Usage: %s testsuite [options] [tests]\n") % argv[0]);
           P(F("Testsuite: a Lua script defining the test suite to run.\n"
               "Options:\n"
               "  -l, --list     just list tests that would be run\n"
============================================================
--- test/extra/bash_completion/library.exp	106bcb86f31d51d9143a893c3ed19ea83e4d24b6
+++ test/extra/bash_completion/library.exp	141bcb762d316eeffaa104d914caa31038480339
@@ -11,12 +11,11 @@ send_user "PATH = $env(PATH)\n"
 send_user "mtn = $mtn\n"
 send_user "initial_dir = $initial_dir\n"
 send_user "PATH = $env(PATH)\n"
-spawn "bash" "-l"
+# some user's ~/.bash_profile start xserver etc; don't do that
+spawn "bash" "--init-file" "/dev/nul"
 send "export PS1='@ '\n"
 send "export PS2='_@ '\n"
 send "pwd\n"
-# For some reason, it seems bash doesn't load the bash completion package,
-# even though started with -l...
 send ". /etc/bash_completion\n"
 expect {
     -timeout 1

reply via email to

[Prev in Thread] Current Thread [Next in Thread]