Fix loop count parsing.

[octave.git] / run-tests.m

diff --git a/run-tests.m b/run-tests.m
index aa285c32e38fb3f70747a75402e57ef6a8515ed2..9d0e7fa03ba48af8a5d619e4553e8f15077684b6 100755 (executable)
--- a/run-tests.m
+++ b/run-tests.m
@@ -1,74 +1,32 @@
 #!/usr/bin/octave --silent
+#
+# You'll need to use the .octaverc in this directory to get the proper
+# paths. You can pass it an integer on the command-line to specify how
+# many times we should run the test suite in succession. The default
+# is 1.
+#
 
-unit_init(1, {});
-
-unit_test_equals("sin[0] == 0", ...
-                0, ...
-                divided_difference(@sin, 0));
-
-unit_test_equals("sin[0, pi] == 0", ...
-                0, ...
-                divided_difference(@sin, [0,pi]));
-
-unit_test_equals("sin[0, pi, 2*pi] == 0", ...
-                0, ...
-                divided_difference(@sin, [0,pi,2*pi]));
-
-unit_test_equals("zero order divided_difference_coefficients", ...
-                [1], ...
-                divided_difference_coefficients([0]));
-
-unit_test_equals("first order divided_difference_coefficients", ...
-                [-1, 1] / pi, ...
-                divided_difference_coefficients([0, pi]));
+addpath('./unit_test');
 
-unit_test_equals("second order divided_difference_coefficients", ...
-                [1, -2, 1] / (2*pi^2), ...
-                divided_difference_coefficients([0, pi, 2*pi]));
+global unittest_results;
 
+unit_init(1, {});
 
-unit_test_equals("1 is odd", ...
-                true, ...
-                odd(1));
-
-unit_test_equals("1 is not even", ...
-                false, ...
-                even(1));
-
-unit_test_equals("2 is not odd", ...
-                false, ...
-                odd(2));
-
-unit_test_equals("2 is even", ...
-                true, ...
-                even(2));
-
-expected_A = [1, 0, 0, 0, 0; ...
-              16, -32,  16,  0,  0; ...
-             0,   16, -32,  16, 0; ...
-             0,   0,   16, -32, 16; ...
-             0,   0,   0,   0,  1];
-unit_test_equals("Homework #1 problem #1 Poisson matrix is correct", ...
-                true, ...
-                expected_A == poisson_matrix(4, 0, 1));
+test_files = glob('tests/*.m');
 
+loop_count = 1;
+arg_list = argv();
+if (length(arg_list) > 0)
+  loop_count = str2num(arg_list{1});
+end
 
-g = @(x) 1 + atan(x);
-expected_fp = 2.1323;
-tol = 1 / 10^10;
-x0 = 2.4;
-unit_test_equals("Homework #2 problem #5 fixed point is correct", ...
-                expected_fp, ...
-                fixed_point_method(g, tol, x0));
+## Source every file that matches the glob above.
+for idx = [ 1 : loop_count ]
+  cellfun(@source, test_files);
+end
 
 
-h = 0.5;
-g1 = @(u) 1 + h*exp(-u(1)^2)/(1+u(2)^2);
-g2 = @(u) 0.5 + h*atan(u(1)^2 + u(2)^2);
-my_g = @(u) [g1(u), g2(u)];
-tol = 1 / 10^9;
-u0 = [1,1];
-expected_fp = [1.0729, 1.0821];
-unit_test_equals("Homework #3 problem #3i fixed point is correct", ...
-                expected_fp, ...
-                fixed_point_method(my_g, tol, u0));
+fprintf('\n');
+fprintf('Total tests attempted: %d\n', unittest_results.total);
+fprintf('Total tests passed: %d\n', unittest_results.pass);
+fprintf('Total tests failed: %d\n', unittest_results.fail);