aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Tromey <tom@tromey.com>2017-08-19 08:53:16 +1000
committerBen Elliston <bje@gnu.org>2017-08-19 08:53:16 +1000
commitddca6201c36d271de18de4010c1ecc46d9503ca6 (patch)
treeb0db4d09b23566ba3275030c7f5729f58ea9d499
parent96eda3cf61071acc6529dbe5667cd0790d4a6f95 (diff)
downloaddejagnu-ddca6201c36d271de18de4010c1ecc46d9503ca6.zip
dejagnu-ddca6201c36d271de18de4010c1ecc46d9503ca6.tar.gz
dejagnu-ddca6201c36d271de18de4010c1ecc46d9503ca6.tar.bz2
* runtest.exp: Fix --directory matching.
Signed-off-by: Ben Elliston <bje@gnu.org>
-rw-r--r--ChangeLog4
-rw-r--r--runtest.exp5
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 61cbbf5..1d939a9 100644
--- 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
--- 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
}