Re: [RFA] Add -s option to source command.

[Doug Evans <dje@google.com>]

[-- Attachment #1: Type: text/plain, Size: 1636 bytes --]

On Sat, Apr 17, 2010 at 8:19 AM, H.J. Lu <hjl.tools@gmail.com> wrote:
>> 2010-04-06  Doug Evans  <dje@google.com>
>>
>>        Add -s option to source command.
>>        * cli/cli-cmds.c (find_and_open_script): Add function comment.
>>        Delete from_tty and cleanupp args.  Split filep arg into file and
>>        full_pathp.  New arg search_path.
>>        (source_script_from_stream): New function.
>>        (source_script_with_search): New function.
>>        (source_script): Rewrite.
>>        (source_command): Parse "-s" option.
>>        (init_cli_cmds): Add "-s" docs to source command help.
>>        * python/python.c (source_python_script): Make file arg a const char *.
>>        Don't call fclose, leave for caller.
>>        * python/python.h (source_python_script): Update.
>>
>>        testsuite/
>>        * gdb.base/source-test.gdb: New file.
>>        * gdb.base/source.exp: Add tests for "source -v" and "source -s".
>>
>>        doc/
>>        * gdb.texinfo (Command Files): Add docs for new "source -s" option.
>>
>
> This caused:
>
> help source^M
> Read commands from a file named FILE.^M
> ^M
> Usage: source [-s] [-v] FILE^M
> -s: search for the script in the source search path,^M
>    even if FILE contains directories.^M
> -v: each command in FILE is echoed as it is executed.^M
> ^M
> Note that the file ".gdbinit" is read automatically in this way^M
> when GDB is started.^M
> (gdb) FAIL: gdb.base/help.exp: help source

Thanks.  Fix checked in.

010-04-19  Doug Evans  <dje@google.com>

        * gdb.base/help.exp (help source): Update expected output.

[-- Attachment #2: help-1.patch.txt --]
[-- Type: text/plain, Size: 1493 bytes --]

2010-04-19  Doug Evans  <dje@google.com>

	* gdb.base/help.exp (help source): Update expected output.

Index: gdb.base/help.exp
===================================================================
RCS file: /cvs/src/src/gdb/testsuite/gdb.base/help.exp,v
retrieving revision 1.38
diff -u -p -r1.38 help.exp
--- gdb.base/help.exp	4 Apr 2010 23:47:16 -0000	1.38
+++ gdb.base/help.exp	20 Apr 2010 05:35:20 -0000
@@ -606,7 +606,9 @@ gdb_test "help stepi" "Step one instruct
 gdb_test "help signal" "Continue program giving it signal.*" "help signal"
 # test help source
 # vxgdb reads .vxgdbinit
-gdb_test "help source" "Read commands from a file named FILE\.\[\r\n\]+Optional -v switch \\(before the filename\\) causes each command in\[\r\n\]+FILE to be echoed as it is executed\.\[\r\n\]+Note that the file \"\[^\"\]*\" is read automatically in this way\[\r\n\]+when GDB is started\." "help source"
+# ".-s. .-v." is written that way to avoid the complications of trying
+# to get "[-s] [-v]" through expect and tcl.
+gdb_test "help source" "Read commands from a file named FILE\.\[\r\n\]+Usage: source .-s. .-v. FILE\[\r\n\]+-s: search for the script in the source search path,\[\r\n\]+\[ \]+even if FILE contains directories\.\[\r\n\]+-v: each command in FILE is echoed as it is executed\.\[\r\n\]+Note that the file \"\[^\"\]*\" is read automatically in this way\[\r\n\]+when GDB is started\." "help source"
 # test help stack
 test_class_help "stack" {
     "Examining the stack\..*\[\r\n\]+"