Patchwork [committed,gdb/testsuite] Fix ls_host return in index-cache.exp

login
register
mail settings
Submitter Tom de Vries
Date May 7, 2019, 9:58 a.m.
Message ID <20190507095802.GA1108@delia>
Download mbox | patch
Permalink /patch/32577/
State New
Headers show

Comments

Tom de Vries - May 7, 2019, 9:58 a.m.
Hi,

When adding a debug print here in index-cache.exp:
...
 proc_with_prefix test_cache_disabled { cache_dir } {
     lassign [ls_host $cache_dir] ret files_before
+    puts "before: '$files_before'"
+    exit
...
we have:
...
files_before: ''
...

When further adding:
...
 proc_with_prefix test_cache_disabled { cache_dir } {
+    exec touch $cache_dir/foo.1 $cache_dir/foo.2 $cache_dir/foo.3
...
we have:
...
files_before: 'foo.1'
...
while we're expecting file_before to contain foo.[123].

Fix this by making the return statement in ls_host return a list rather than a
string (in accordance with the ls_host documentation), after which we have:
...
files_before: 'foo.1 foo.2 foo.3'
...

Tested on x86_64-linux.

Committed to trunk.

Thanks,
- Tom

[gdb/testsuite] Fix ls_host return in index-cache.exp

gdb/testsuite/ChangeLog:

2019-05-07  Tom de Vries  <tdevries@suse.de>

	* gdb.base/index-cache.exp (ls_host): Fix return statement.

---
 gdb/testsuite/gdb.base/index-cache.exp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Simon Marchi - May 7, 2019, 1:15 p.m.
On 2019-05-07 5:58 a.m., Tom de Vries wrote:
> Hi,
> 
> When adding a debug print here in index-cache.exp:
> ...
>  proc_with_prefix test_cache_disabled { cache_dir } {
>      lassign [ls_host $cache_dir] ret files_before
> +    puts "before: '$files_before'"
> +    exit
> ...
> we have:
> ...
> files_before: ''
> ...
> 
> When further adding:
> ...
>  proc_with_prefix test_cache_disabled { cache_dir } {
> +    exec touch $cache_dir/foo.1 $cache_dir/foo.2 $cache_dir/foo.3
> ...
> we have:
> ...
> files_before: 'foo.1'
> ...
> while we're expecting file_before to contain foo.[123].
> 
> Fix this by making the return statement in ls_host return a list rather than a
> string (in accordance with the ls_host documentation), after which we have:
> ...
> files_before: 'foo.1 foo.2 foo.3'
> ...
> 
> Tested on x86_64-linux.
> 
> Committed to trunk.
> 
> Thanks,
> - Tom
> 
> [gdb/testsuite] Fix ls_host return in index-cache.exp
> 
> gdb/testsuite/ChangeLog:
> 
> 2019-05-07  Tom de Vries  <tdevries@suse.de>
> 
> 	* gdb.base/index-cache.exp (ls_host): Fix return statement.
> 
> ---
>  gdb/testsuite/gdb.base/index-cache.exp | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/gdb/testsuite/gdb.base/index-cache.exp b/gdb/testsuite/gdb.base/index-cache.exp
> index 5baba84360..b76a02b736 100644
> --- a/gdb/testsuite/gdb.base/index-cache.exp
> +++ b/gdb/testsuite/gdb.base/index-cache.exp
> @@ -50,7 +50,7 @@ proc ls_host { dir } {
>  	}
>      }
>  
> -    return "0 $filtered"
> +    return [list 0 $filtered]
>  }
>  
>  # Execute "show index-cache stats" and verify the output against expected
> 

Oh, thanks!

Simon

Patch

diff --git a/gdb/testsuite/gdb.base/index-cache.exp b/gdb/testsuite/gdb.base/index-cache.exp
index 5baba84360..b76a02b736 100644
--- a/gdb/testsuite/gdb.base/index-cache.exp
+++ b/gdb/testsuite/gdb.base/index-cache.exp
@@ -50,7 +50,7 @@  proc ls_host { dir } {
 	}
     }
 
-    return "0 $filtered"
+    return [list 0 $filtered]
 }
 
 # Execute "show index-cache stats" and verify the output against expected