test/org/openjdk/jigsaw/tester.sh

*** 101,110 ****
--- 101,111 ----
      efile = toPath(tdir, "expected");
      print e >efile;
      close(efile);
      msdir = toPath(tdir, "src");
      mkdir(msdir);
+     moduleclassFound = 0;
    }
  
    /^module / {
      module = $2;
      mname = module;
*** 145,156 ****
    }
  
    /^./ {
      if (module) {
        print $0 >>mfile;
!       if (match($0, /^ +class +([a-zA-Z.]+) *;/)) print module >toPath(tdir, "main");
      }
      if (class) print $0 >>cfile;
      next;
    }
  
    /^#?$/ { module = 0; class = 0; }
--- 146,162 ----
    }
  
    /^./ {
      if (module) {
        print $0 >>mfile;
!       if (match($0, /^ +class +([a-zA-Z.]+) *;/)) {
!           if (moduleclassFound == 0) {
!               print module >toPath(tdir, "main");
!               moduleclassFound = 1;
           }
+       }
+     }
      if (class) print $0 >>cfile;
      next;
    }
  
    /^#?$/ { module = 0; class = 0; }
*** 242,254 ****
--- 248,262 ----
    pdir=`echo $BIN | cut -c1-3`
    if [ -z "$TESTSRC" -a "$pdir" = "../" ]; then
      BIN=../$BIN;
    fi
    for t in *; do
+     if [ -d $t ] ; then
        cd $t
        run `echo $t | cut -c4-` || /bin/true
        cd ..
+     fi
    done
  fi
  
  if [ $tests -gt 1 ]; then
    echo