Minor corrections

Removed som debugging leftovers, and corrected the behaviour of new proj
option -C / -VC, for checking internal regression tests.

3 files changed, 7 insertions, 13 deletions

diff --git a/src/PJ_aea.c b/src/PJ_aea.c
index 8285e68f..0ebbb82f 100644
--- a/src/PJ_aea.c
+++ b/src/PJ_aea.c
@@ -225,7 +225,7 @@ int pj_aea_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=aea   +ellps=GRS80  +lat_1=0 +lat_2=2"};
-    char s_args[] = {"+proj=aea   +ellps=GRS80  +lat_1=0 +lat_2=2"};
+    char s_args[] = {"+proj=aea   +a=6400000    +lat_1=0 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
@@ -285,7 +285,7 @@ int pj_leac_selftest (void) {
     double tolerance_xy = 1e-7;
 
     char e_args[] = {"+proj=leac   +ellps=GRS80  +lat_1=0 +lat_2=2"};
-    char s_args[] = {"+proj=leac   +ellps=GRS80  +lat_1=0 +lat_2=2"};
+    char s_args[] = {"+proj=leac   +a=6400000    +lat_1=0 +lat_2=2"};
 
     LP fwd_in[] = {
         { 2, 1},
diff --git a/src/pj_generic_selftest.c b/src/pj_generic_selftest.c
index e2d24baf..5ac239e2 100644
--- a/src/pj_generic_selftest.c
+++ b/src/pj_generic_selftest.c
@@ -81,18 +81,13 @@ Returns 0 if all data agree to within the accuracy specified in
 
     PJ *P;
 
-puts ("testing");
     if (e_args) {
-
- puts ("e_args");
- puts (e_args);
-
         P = pj_init_plus(e_args);
         if (0==P)
             return 2;
 
         /* Test forward ellipsoidal */
-        if (e_fwd_expect) { puts ("e_fwd");
+        if (e_fwd_expect) {
             for (i = 0; i < n_fwd; i++)
                 if (deviates_xy (e_fwd_expect[i], pj_fwd_deg ( fwd_in[i], P ), tolerance_xy))
                     break;
@@ -101,7 +96,7 @@ puts ("testing");
         }
 
         /* Test inverse ellipsoidal */
-        if (e_inv_expect)  { puts ("e_inv");
+        if (e_inv_expect)  {
             for (i = 0; i < n_inv; i++)
                 if (deviates_lp (e_inv_expect[i], pj_inv ( inv_in[i], P ), tolerance_lp))
                     break;
@@ -114,14 +109,12 @@ puts ("testing");
 
 
     if (s_args) {
- puts ("s_args");
- puts (s_args);
         P = pj_init_plus(s_args);
         if (0==P)
             return 3;
 
         /* Test forward spherical */
-        if (s_fwd_expect)  { puts ("s_fwd");
+        if (s_fwd_expect)  {
             for (i = 0; i < n_fwd; i++)
                 if (deviates_xy (s_fwd_expect[i], pj_fwd_deg ( fwd_in[i], P ), tolerance_xy))
                     break;
@@ -130,7 +123,7 @@ puts ("testing");
         }
 
         /* Test inverse spherical */
-        if (s_inv_expect)  { puts ("s_inv");
+        if (s_inv_expect)  {
             for (i = 0; i < n_inv; i++)
                 if (deviates_lp (s_inv_expect[i], pj_inv ( inv_in[i], P ), tolerance_lp))
                     break;
diff --git a/src/proj.c b/src/proj.c
index 40c6df94..00853994 100644
--- a/src/proj.c
+++ b/src/proj.c
@@ -269,6 +269,7 @@ int main(int argc, char **argv) {
                 continue;
               case 'C': /* Check - run internal regression tests */
                 pj_run_selftests (very_verby);
+                return 0;
                 continue;
               case 'v': /* monitor dump of initialization */
                 mon = 1;