Mercurial > octave

comparison scripts/testfun/__run_test_suite__.m @ 21633:dcf8922b724b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Deprecate printf, puts, and scanf. Make fputs a M-file. * libinterp/corefcn/file-io.cc: extracted printf, puts, and scanf to M-files. * scripts/deprecated/printf.m: new function, equivalent to version file-io.cc. * scripts/deprecated/puts.m: new function, equivalent to version file-io.cc. * scripts/deprecated/scanf.m: new function, equivalent to version file-io.cc. * scripts/deprecated/module.mk: added printf, puts, and scanf. * scripts/io/fputs.m: new function, equivalent to version file-io.cc. * scripts/io/module.mk: added fputs. * doc/interpreter/io.txi: adapted documentation to current implementation. * NEWS: announced changes. * doc/interpreter/basics.txi: replaced printf by fprintf. * doc/interpreter/stmt.txi: replaced printf by fprintf. * doc/interpreter/var.txi: replaced printf by fprintf. * doc/refcard/refcard.tex: removed printf and scanf. * examples/code/@FIRfilter/display.m: replaced printf by fprintf. * examples/code/@polynomial/display.m: replaced printf by fprintf. * scripts/@ftp/display.m: replaced printf by fprintf. * scripts/general/inputParser.m: replaced printf by fprintf. * scripts/general/methods.m: replaced printf by fprintf. * scripts/general/profexplore.m: replaced printf by fprintf. * scripts/general/profshow.m: replaced printf by fprintf. * scripts/help/help.m: replaced puts by fputs and printf by fprintf. * scripts/help/lookfor.m: replaced puts by fputs and printf by fprintf. * scripts/help/which.m: replaced printf by fprintf. * scripts/image/imformats.m: replaced printf by fprintf. * scripts/io/beep.m: replaced puts by fputs. * scripts/io/textread.m: replaced printf by fprintf. * scripts/java/javaclasspath.m: replaced printf by fprintf. * scripts/java/javamem.m: replaced printf by fprintf. * scripts/miscellaneous/dir.m: replaced printf by fprintf. * scripts/miscellaneous/dos.m: replaced printf by fprintf. * scripts/miscellaneous/fact.m: replaced printf by fprintf. * scripts/miscellaneous/info.m: replaced printf by fprintf. * scripts/miscellaneous/license.m: replaced printf by fprintf. * scripts/miscellaneous/ls.m: replaced puts by fputs. * scripts/miscellaneous/menu.m: replaced printf by fprintf. * scripts/miscellaneous/mkoctfile.m: replaced printf by fprintf. * scripts/miscellaneous/private/display_info_file.m: * scripts/miscellaneous/unix.m: replaced printf by fprintf. * scripts/miscellaneous/ver.m: replaced printf by fprintf. * scripts/miscellaneous/what.m: replaced printf by fprintf. * scripts/ode/ode23.m: replaced printf by fprintf. * scripts/ode/ode45.m: replaced printf by fprintf. * scripts/optimization/fminbnd.m: replaced printf by fprintf. * scripts/optimization/optimset.m: replaced puts by fputs and printf by fprintf. * scripts/optimization/sqp.m: replaced printf by fprintf. * scripts/pkg/pkg.m: replaced printf by fprintf. * scripts/pkg/private/describe.m: replaced printf by fprintf. * scripts/pkg/private/install.m: replaced printf by fprintf. * scripts/pkg/private/installed_packages.m: replaced printf by fprintf. * scripts/pkg/private/list_forge_packages.m: replaced puts by fputs and printf by fprintf. * scripts/pkg/private/rebuild.m: replaced printf by fprintf. * scripts/plot/util/__gnuplot_drawnow__.m: replaced puts by fputs and printf by fprintf. * scripts/signal/stft.m: replaced printf by fprintf. * scripts/sparse/bicg.m: replaced printf by fprintf. * scripts/sparse/bicgstab.m: replaced printf by fprintf. * scripts/sparse/cgs.m: replaced printf by fprintf. * scripts/sparse/pcg.m: replaced printf by fprintf. * scripts/sparse/pcr.m: replaced printf by fprintf. * scripts/sparse/qmr.m: replaced printf by fprintf. * scripts/statistics/models/logistic_regression.m: replaced printf by fprintf. * scripts/statistics/tests/anova.m: replaced printf by fprintf. * scripts/statistics/tests/bartlett_test.m: replaced printf by fprintf. * scripts/statistics/tests/chisquare_test_homogeneity.m: replaced printf by fprintf. * scripts/statistics/tests/chisquare_test_independence.m: replaced printf by fprintf. * scripts/statistics/tests/cor_test.m: replaced printf by fprintf. * scripts/statistics/tests/f_test_regression.m: replaced printf by fprintf. * scripts/statistics/tests/hotelling_test.m: replaced printf by fprintf. * scripts/statistics/tests/hotelling_test_2.m: replaced printf by fprintf. * scripts/statistics/tests/kolmogorov_smirnov_test.m: replaced printf by fprintf. * scripts/statistics/tests/kolmogorov_smirnov_test_2.m: replaced printf by fprintf. * scripts/statistics/tests/kruskal_wallis_test.m: replaced printf by fprintf. * scripts/statistics/tests/manova.m: replaced printf by fprintf. * scripts/statistics/tests/mcnemar_test.m: replaced printf by fprintf. * scripts/statistics/tests/prop_test_2.m: replaced printf by fprintf. * scripts/statistics/tests/run_test.m: replaced printf by fprintf. * scripts/statistics/tests/sign_test.m: replaced printf by fprintf. * scripts/statistics/tests/t_test.m: replaced printf by fprintf. * scripts/statistics/tests/t_test_2.m: replaced printf by fprintf. * scripts/statistics/tests/t_test_regression.m: replaced printf by fprintf. * scripts/statistics/tests/u_test.m: replaced printf by fprintf. * scripts/statistics/tests/var_test.m: replaced printf by fprintf. * scripts/statistics/tests/welch_test.m: replaced printf by fprintf. * scripts/statistics/tests/wilcoxon_test.m: replaced printf by fprintf. * scripts/statistics/tests/z_test.m: replaced printf by fprintf. * scripts/statistics/tests/z_test_2.m: replaced printf by fprintf. * scripts/strings/strtok.m: replaced printf by fprintf. * scripts/testfun/__run_test_suite__.m: replaced puts by fputs and printf by fprintf. * scripts/testfun/demo.m: replaced printf by fprintf. * scripts/testfun/example.m: replaced printf by fprintf. * scripts/testfun/private/compare_plot_demos.m: replaced printf by fprintf. * scripts/testfun/rundemos.m: replaced printf by fprintf. * scripts/testfun/runtests.m: replaced puts by fputs and printf by fprintf. * scripts/testfun/speed.m: replaced printf by fprintf. * scripts/testfun/test.m: replaced printf by fprintf. * scripts/time/calendar.m: replaced puts by fputs and printf by fprintf. * test/io.tst: replaced printf by fprintf.
author Kai T. Ohlhus <k.ohlhus@gmail.com>
date Wed, 20 Apr 2016 17:53:10 +0200
parents 1da428cbf401
children 96518f623c91
comparison
equal deleted inserted replaced
21632:e3c44a120a8c 21633:dcf8922b724b
52 if (fid < 0) 52 if (fid < 0)
53 error ("__run_test_suite__: could not open %s for writing", logfile); 53 error ("__run_test_suite__: could not open %s for writing", logfile);
54 endif 54 endif
55 test ("", "explain", fid); 55 test ("", "explain", fid);
56 dp = dn = dxf = dsk = 0; 56 dp = dn = dxf = dsk = 0;
57 puts ("\nIntegrated test scripts:\n\n"); 57 fputs ("\nIntegrated test scripts:\n\n");
58 for i = 1:length (fcndirs) 58 for i = 1:length (fcndirs)
59 [p, n, xf, sk] = run_test_script (fid, fcndirs{i}); 59 [p, n, xf, sk] = run_test_script (fid, fcndirs{i});
60 dp += p; 60 dp += p;
61 dn += n; 61 dn += n;
62 dxf += xf; 62 dxf += xf;
63 dsk += sk; 63 dsk += sk;
64 endfor 64 endfor
65 puts ("\nFixed test scripts:\n\n"); 65 fputs ("\nFixed test scripts:\n\n");
66 for i = 1:length (fixedtestdirs) 66 for i = 1:length (fixedtestdirs)
67 [p, n, xf, sk] = run_test_dir (fid, fixedtestdirs{i}); 67 [p, n, xf, sk] = run_test_dir (fid, fixedtestdirs{i});
68 dp += p; 68 dp += p;
69 dn += n; 69 dn += n;
70 dxf += xf; 70 dxf += xf;
71 dsk += sk; 71 dsk += sk;
72 endfor 72 endfor
73 puts ("\nSummary:\n\n"); 73 fputs ("\nSummary:\n\n");
74 nfail = dn - dp - dxf; 74 nfail = dn - dp - dxf;
75 printf (" PASS %6d\n", dp); 75 fprintf (" PASS %6d\n", dp);
76 printf (" FAIL %6d\n", nfail); 76 fprintf (" FAIL %6d\n", nfail);
77 if (dxf > 0) 77 if (dxf > 0)
78 printf (" XFAIL %6d\n", dxf); 78 fprintf (" XFAIL %6d\n", dxf);
79 endif 79 endif
80 if (dsk > 0) 80 if (dsk > 0)
81 printf (" SKIPPED %6d\n", dsk); 81 fprintf (" SKIPPED %6d\n", dsk);
82 endif 82 endif
83 puts ("\n"); 83 fputs ("\n");
84 printf ("See the file %s for additional details.\n", logfile); 84 fprintf ("See the file %s for additional details.\n", logfile);
85 if (dxf > 0) 85 if (dxf > 0)
86 puts ("\n"); 86 fputs ("\n");
87 puts ("Expected failures (listed as XFAIL above) are known bugs.\n"); 87 fputs ("Expected failures (listed as XFAIL above) are known bugs.\n");
88 puts ("Please help improve Octave by contributing fixes for them.\n"); 88 fputs ("Please help improve Octave by contributing fixes for them.\n");
89 endif 89 endif
90 if (dsk > 0) 90 if (dsk > 0)
91 puts ("\n"); 91 fputs ("\n");
92 puts ("Tests are most often skipped because the features they require\n"); 92 fputs ("Tests are most often skipped because the features they require\n");
93 puts ("have been disabled. Features are most often disabled because\n"); 93 fputs ("have been disabled. Features are most often disabled because\n");
94 puts ("they require dependencies that were not present when Octave\n"); 94 fputs ("they require dependencies that were not present when Octave\n");
95 puts ("was built. The configure script should have printed a summary\n"); 95 fputs ("was built. The configure script should have printed a summary\n");
96 puts ("at the end of its run indicating which dependencies were not found.\n"); 96 fputs ("at the end of its run indicating which dependencies were not found.\n");
97 endif 97 endif
98 98
99 ## Weed out deprecated and private functions 99 ## Weed out deprecated and private functions
100 weed_idx = cellfun (@isempty, regexp (files_with_tests, '\<deprecated\>|\<private\>', 'once')); 100 weed_idx = cellfun (@isempty, regexp (files_with_tests, '\<deprecated\>|\<private\>', 'once'));
101 files_with_tests = files_with_tests(weed_idx); 101 files_with_tests = files_with_tests(weed_idx);
102 weed_idx = cellfun (@isempty, regexp (files_with_no_tests, '\<deprecated\>|\<private\>', 'once')); 102 weed_idx = cellfun (@isempty, regexp (files_with_no_tests, '\<deprecated\>|\<private\>', 'once'));
103 files_with_no_tests = files_with_no_tests(weed_idx); 103 files_with_no_tests = files_with_no_tests(weed_idx);
104 104
105 report_files_with_no_tests (files_with_tests, files_with_no_tests, ".m"); 105 report_files_with_no_tests (files_with_tests, files_with_no_tests, ".m");
106 106
107 puts ("\nPlease help improve Octave by contributing tests for these files\n"); 107 fputs ("\nPlease help improve Octave by contributing tests for these files\n");
108 printf ("(see the list in the file %s).\n\n", logfile); 108 fprintf ("(see the list in the file %s).\n\n", logfile);
109 109
110 fprintf (fid, "\nFiles with no tests:\n\n%s", 110 fprintf (fid, "\nFiles with no tests:\n\n%s",
111 list_in_columns (files_with_no_tests, 80)); 111 list_in_columns (files_with_no_tests, 80));
112 fclose (fid); 112 fclose (fid);
113 catch 113 catch
128 128
129 endfunction 129 endfunction
130 130
131 function print_test_file_name (nm) 131 function print_test_file_name (nm)
132 filler = repmat (".", 1, 60-length (nm)); 132 filler = repmat (".", 1, 60-length (nm));
133 printf (" %s %s", nm, filler); 133 fprintf (" %s %s", nm, filler);
134 endfunction 134 endfunction
135 135
136 function print_pass_fail (p, n, xf, sk) 136 function print_pass_fail (p, n, xf, sk)
137 if ((n + sk) > 0) 137 if ((n + sk) > 0)
138 printf (" PASS %4d/%-4d", p, n); 138 fprintf (" PASS %4d/%-4d", p, n);
139 nfail = n - p - xf; 139 nfail = n - p - xf;
140 if (nfail > 0) 140 if (nfail > 0)
141 printf ("\n%71s %3d", "FAIL ", nfail); 141 fprintf ("\n%71s %3d", "FAIL ", nfail);
142 endif 142 endif
143 if (sk > 0) 143 if (sk > 0)
144 printf ("\n%71s %3d", "SKIP ", sk); 144 fprintf ("\n%71s %3d", "SKIP ", sk);
145 endif 145 endif
146 if (xf > 0) 146 if (xf > 0)
147 printf ("\n%71s %3d", "XFAIL", xf); 147 fprintf ("\n%71s %3d", "XFAIL", xf);
148 endif 148 endif
149 endif 149 endif
150 puts ("\n"); 150 fputs ("\n");
151 endfunction 151 endfunction
152 152
153 function retval = has_functions (f) 153 function retval = has_functions (f)
154 n = length (f); 154 n = length (f);
155 if (n > 3 && strcmpi (f((end-2):end), ".cc")) 155 if (n > 3 && strcmpi (f((end-2):end), ".cc"))
271 ## DEFUN definitions. 271 ## DEFUN definitions.
272 files_with_no_tests(end+1) = f; 272 files_with_no_tests(end+1) = f;
273 endif 273 endif
274 endif 274 endif
275 endfor 275 endfor
276 ## printf("%s%s -> passes %d of %d tests\n", ident, d, dp, dn); 276 ## fprintf("%s%s -> passes %d of %d tests\n", ident, d, dp, dn);
277 endfunction 277 endfunction
278 278
279 function n = num_elts_matching_pattern (lst, pat) 279 function n = num_elts_matching_pattern (lst, pat)
280 n = sum (! cellfun ("isempty", regexp (lst, pat, 'once'))); 280 n = sum (! cellfun ("isempty", regexp (lst, pat, 'once')));
281 endfunction 281 endfunction
283 function report_files_with_no_tests (with, without, typ) 283 function report_files_with_no_tests (with, without, typ)
284 pat = ['\' typ "$"]; 284 pat = ['\' typ "$"];
285 n_with = num_elts_matching_pattern (with, pat); 285 n_with = num_elts_matching_pattern (with, pat);
286 n_without = num_elts_matching_pattern (without, pat); 286 n_without = num_elts_matching_pattern (without, pat);
287 n_tot = n_with + n_without; 287 n_tot = n_with + n_without;
288 printf ("\n%d (of %d) %s files have no tests.\n", n_without, n_tot, typ); 288 fprintf ("\n%d (of %d) %s files have no tests.\n", n_without, n_tot, typ);
289 endfunction 289 endfunction
290 290
291 291
292 ## No test coverage for internal function. It is tested through calling fcn. 292 ## No test coverage for internal function. It is tested through calling fcn.
293 %!assert (1) 293 %!assert (1)
294