1 files changed, 4 insertions, 1 deletions
diff --git a/gcc/dg.exp b/gcc/dg.exp
index a490409..71e7105 100644
--- a/gcc/dg.exp
+++ b/gcc/dg.exp
@@ -23,7 +23,10 @@ load_lib elna-dg.exp
 dg-init
 
 # Main loop.
-elna-dg-runtest [lsort [find $srcdir/$subdir *.elna]]
+# Single-module .elna files and multi-module directories,
+# both exactly one level below the category directories.
+elna-dg-runtest-single [lsort [glob -nocomplain $srcdir/$subdir/*/*.elna]]
+elna-dg-runtest-multi [lsort [glob -nocomplain -type d $srcdir/$subdir/*/*]]
 
 # All done.
 dg-finish