Changeset 0d1984 in git

Timestamp:

May 11, 2012, 3:51:24 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

d7eac3b10f1d0681478bd033cc259409eeab9132

Parents:

860d71cc6a362dccf8aea3a8620a4e147d6ab72c

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-05-11 15:51:24+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-05-11 15:51:35+02:00

Message:

better factory test (for 'make check')

add: output test parameters: p,i
chg: no immediate exit on failed test
add: accumulate the return value

File:

• factory/test.cc (modified) (5 diffs)

factory/test.cc

@@ -24 +24 @@
 int test2 (int p)
 {
+  int ret = 1;
   setCharacteristic (p);
+  printf ("p: %d, i: %d", p, 0);
   CanonicalForm d1= Variable (1) + Variable (2) + 1;
   CanonicalForm f1= Variable (1) - Variable (2) - 2;
@@ -33 +35 @@
   CanonicalForm h= gcd (f,g);
   h /= Lc (h);
+  printf (", h==d? %d\n", (h == d));
   if (h != d)
-    return -1;
-  printf ("h==d? %d\n", (h == d));
+    ret = -1;
   for (int i= 3; i <= 11; i++)
   {
+    printf ("p: %d, i: %d", p, i);
     d1 += power (Variable (i), i);
     f1 -= power (Variable (i), i);
@@ -46 +49 @@
     h= gcd (f,g);
     h /= Lc (h);
+    printf (", h==d? %d\n", (h == d));
     if (h != d)
-      return -1;
-    printf ("h==d? %d\n", (h == d));
+      ret = -1;
   }
-  return 1;
+  return ret;
 }
 
@@ -97 +100 @@
 int main( int, char *argv[] )
 {
+  int ret = 0;
+  
   feInitResources(argv[0]);
-   
+
+//  On (SW_USE_EZGCD); On (SW_USE_EZGCD_P); // TODO&NOTE: these switches lead to failed tests (with nonzero p)!
+  
   int t= test2 (0);
   if (t < 0)
-    return t;
+    ret = t;
   /*t= test5 (0);
   if (t < 0)
@@ -116 +123 @@
   t= test2 (3);
   if (t < 0)
-    return t;
+    ret += t;
+  
   t= test2 (101);
   if (t < 0)
-    return t;
+    ret += t;
+  
   t= test2 (43051);
   if (t < 0)
-    return t;
-  return 0;
+    ret += t;
+  
+  return ret;
 }