Revert "Merging in 1.0.2."

This reverts commit 50cf3276e7.

userland/testbin/matmult/matmult.c

@@ -41,6 +41,7 @@
 
 #include <unistd.h>
 #include <stdio.h>
+#include <test161/test161.h>
 
 #define Dim 	72	/* sum total of the arrays doesn't fit in
 			 * physical memory
@@ -58,33 +59,49 @@ main(void)
 {
     int i, j, k, r;
 
-    for (i = 0; i < Dim; i++)		/* first initialize the matrices */
-	for (j = 0; j < Dim; j++) {
-	     A[i][j] = i;
-	     B[i][j] = j;
-	     C[i][j] = 0;
+    for (i = 0; i < Dim; i++) {		/* first initialize the matrices */
+		for (j = 0; j < Dim; j++) {
+			TEST161_LPROGRESS_N(i*Dim + j, 1000);
+			A[i][j] = i;
+			B[i][j] = j;
+			C[i][j] = 0;
+		}
 	}
+	nprintf("\n");
 
-    for (i = 0; i < Dim; i++)		/* then multiply them together */
-	for (j = 0; j < Dim; j++)
-            for (k = 0; k < Dim; k++)
-		T[i][j][k] = A[i][k] * B[k][j];
+    for (i = 0; i < Dim; i++) {		/* then multiply them together */
+		for (j = 0; j < Dim; j++) {
+            for (k = 0; k < Dim; k++) {
+				TEST161_LPROGRESS_N(i*j*Dim*Dim + k, 50000);
+				T[i][j][k] = A[i][k] * B[k][j];
+			}
+		}
+	}
+	nprintf("\n");
 
-    for (i = 0; i < Dim; i++)
-	for (j = 0; j < Dim; j++)
-            for (k = 0; k < Dim; k++)
-		C[i][j] += T[i][j][k];
+    for (i = 0; i < Dim; i++) {
+		for (j = 0; j < Dim; j++) {
+            for (k = 0; k < Dim; k++) {
+				TEST161_LPROGRESS_N(i*j*Dim*Dim + k, 50000);
+				C[i][j] += T[i][j][k];
+			}
+		}
+	}
+	nprintf("\n");
 
     r = 0;
     for (i = 0; i < Dim; i++)
 	    r += C[i][i];
 
-    printf("matmult finished.\n");
-    printf("answer is: %d (should be %d)\n", r, RIGHT);
+    nprintf("matmult finished.\n");
+    nprintf("answer is: %d (should be %d)\n", r, RIGHT);
     if (r != RIGHT) {
-	    printf("FAILED\n");
+	    nprintf("FAILED\n");
+		success(TEST161_FAIL, SECRET, "/testbin/matmult");
 	    return 1;
     }
-    printf("Passed.\n");
+
+    nprintf("Passed.\n");
+	success(TEST161_SUCCESS, SECRET, "/testbin/matmult");
     return 0;
 }