Mercurial > octave

changeset 26278:01fdb337fa20 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
test: do not look for BISTs in .m files in fixed test dirs (bug #55250) * __run_test_suite__.m (run_test_dir): Distinguish between file patterns to search for tests in function dirs versus fixed test dirs. Avoids including auxiliary function and script files in the number of files missing tests.
author Mike Miller <mtmiller@octave.org>
date Fri, 21 Dec 2018 09:43:30 -0800
parents e92a44730a6e
children 42437d6e4096 da54f14258e1
files scripts/testfun/__run_test_suite__.m
diffstat 1 files changed, 7 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/scripts/testfun/__run_test_suite__.m	Fri Nov 02 22:38:28 2018 +0100
+++ b/scripts/testfun/__run_test_suite__.m	Fri Dec 21 09:43:30 2018 -0800
@@ -61,7 +61,7 @@
       test ("", "explain", fid);
       puts ("\nIntegrated test scripts:\n\n");
       for i = 1:length (fcndirs)
-        [p, n, xf, xb, sk, rtsk, rgrs] = run_test_dir (fid, fcndirs{i});
+        [p, n, xf, xb, sk, rtsk, rgrs] = run_test_dir (fid, fcndirs{i}, false);
         dp += p;
         dn += n;
         dxf += xf;
@@ -72,7 +72,7 @@
       endfor
       puts ("\nFixed test scripts:\n\n");
       for i = 1:length (fixedtestdirs)
-        [p, n, xf, xb, sk, rtsk, rgrs] = run_test_dir (fid, fixedtestdirs{i});
+        [p, n, xf, xb, sk, rtsk, rgrs] = run_test_dir (fid, fixedtestdirs{i}, true);
         dp += p;
         dn += n;
         dxf += xf;
@@ -150,14 +150,14 @@
     regress = drgrs;
   endif
 
-  function [dp, dn, dxf, dxb, dsk, drtsk, drgrs] = run_test_dir (fid, d)
+  function [dp, dn, dxf, dxb, dsk, drtsk, drgrs] = run_test_dir (fid, d, is_fixed = false)
 
     lst = dir (d);
     dp = dn = dxf = dxb = dsk = drtsk = drgrs = 0;
     for i = 1:length (lst)
       nm = lst(i).name;
       if (lst(i).isdir && nm(1) != "." && ! strcmp (nm, "private"))
-        [p, n, xf, xb, sk, rtsk, rgrs] = run_test_dir (fid, [d, filesep, nm]);
+        [p, n, xf, xb, sk, rtsk, rgrs] = run_test_dir (fid, [d, filesep, nm], is_fixed);
         dp += p;
         dn += n;
         dxf += xf;
@@ -180,10 +180,9 @@
         if (nm(1) == '.')
           continue
         endif
-        if ((length (nm) > 2 && strcmpi (nm((end-1):end), ".m"))
-            || (length (nm) > 4
-                && (strcmpi (nm((end-3):end), "-tst")
-                    || strcmpi (nm((end-3):end), ".tst"))))
+        if ((! is_fixed && length (nm) > 2 && strcmpi (nm((end-1):end), ".m"))
+            || (! is_fixed && length (nm) > 4 && strcmpi (nm((end-3):end), "-tst"))
+            || (is_fixed && length (nm) > 4 && strcmpi (nm((end-3):end), ".tst")))
           p = n = xf = xb = sk = rtsk = rgrs = 0;
           ffnm = fullfile (d, nm);
           ## Only run if contains %!test, %!assert, %!error, %!fail, or %!warning