* runtest.exp: Fix --directory matching.

Signed-off-by: Ben Elliston <bje@gnu.org>

diff --git a/ChangeLog b/ChangeLog
index 61cbbf5..1d939a9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2017-08-18  Tom Tromey  <tom@tromey.com>
+
+       * runtest.exp: Fix --directory matching.
+
 2017-08-15  Ben Elliston  <bje@gnu.org>
 
        * lib/framework.exp (xml_tag): New proc.

diff --git a/runtest.exp b/runtest.exp
index 173c9a4..02c10ed 100644 (file)
--- a/runtest.exp
+++ b/runtest.exp
@@ -1829,7 +1829,10 @@ foreach current_target $target_list {
                        # list of directories.  Look for match on each item.
                        set found 0
                        foreach directory $cmdline_dir_to_run {
-                           if {[string match $directory $dir]} {
+                           # Look for a directory that ends with the
+                           # provided --directory name.
+                           if {[string match "$directory" $dir]
+                               || [string match "*/$directory" $dir]} {
                                set found 1
                                break
                            }