[GNUnet-SVN] r37441 - gnunet/src/pt

[gnunet]

Author: grothoff
Date: 2016-07-02 21:29:45 +0200 (Sat, 02 Jul 2016)
New Revision: 37441

Modified:
   gnunet/src/pt/test_gns_vpn.c
   gnunet/src/pt/test_gnunet_vpn.c
Log:
-indicate skip if tests are not used

Modified: gnunet/src/pt/test_gns_vpn.c
===================================================================
--- gnunet/src/pt/test_gns_vpn.c        2016-07-02 19:26:58 UTC (rev 37440)
+++ gnunet/src/pt/test_gns_vpn.c        2016-07-02 19:29:45 UTC (rev 37441)
@@ -725,7 +725,7 @@
     fprintf (stderr,
             "Executable iptables not found in approved directories: %s, 
skipping\n",
             strerror (errno));
-    return 0;
+    return 77;
   }
 
   if (0 != fork_and_exec (sbin_iptables, iptables_args))
@@ -732,7 +732,7 @@
   {
     fprintf (stderr,
              "Failed to run `iptables -t mangle -L -v'. Skipping test.\n");
-    return 0;
+    return 77;
   }
 
   if (0 != ACCESS ("/dev/net/tun", R_OK))
@@ -742,7 +742,7 @@
                              "/dev/net/tun");
     fprintf (stderr,
             "WARNING: System unable to run test, skipping.\n");
-    return 0;
+    return 77;
   }
 
   bin_vpn = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-vpn");
@@ -765,7 +765,7 @@
     GNUNET_free (bin_exit);
     GNUNET_free (bin_dns);
     GNUNET_free (srv_dns);
-    return 0;
+    return 77;
   }
   GNUNET_free (bin_vpn);
   GNUNET_free (bin_exit);
@@ -782,7 +782,7 @@
              (0 == (S_ISUID & s.st_mode)) || (0 != getuid()) );
     GNUNET_free (bin_dns);
     GNUNET_free (srv_dns);
-    return 0;
+    return 77;
   }
   if ( (0 != stat (srv_dns, &s)) ||
        (my_gid == s.st_gid) ||
@@ -796,7 +796,7 @@
              (0 == (S_ISGID & s.st_mode)) );
     GNUNET_free (bin_dns);
     GNUNET_free (srv_dns);
-    return 0;
+    return 77;
   }
   GNUNET_free (bin_dns);
   GNUNET_free (srv_dns);
@@ -815,7 +815,7 @@
   {
     fprintf (stderr,
             "Required address families not supported by this system, skipping 
test.\n");
-    return 0;
+    return 77;
   }
   if (0 != curl_global_init (CURL_GLOBAL_WIN32))
   {

Modified: gnunet/src/pt/test_gnunet_vpn.c
===================================================================
--- gnunet/src/pt/test_gnunet_vpn.c     2016-07-02 19:26:58 UTC (rev 37440)
+++ gnunet/src/pt/test_gnunet_vpn.c     2016-07-02 19:29:45 UTC (rev 37441)
@@ -404,7 +404,7 @@
   const char *bin;
   char *vpn_binary;
   char *exit_binary;
-  int ret=0;
+  int ret = 0;
 
 #ifndef MINGW
   if (0 != ACCESS ("/dev/net/tun", R_OK))
@@ -413,7 +413,7 @@
                               "/dev/net/tun");
     fprintf (stderr,
              "WARNING: System unable to run test, skipping.\n");
-    return 0;
+    return 77;
   }
 #endif
   vpn_binary = GNUNET_OS_get_libexec_binary_path ("gnunet-helper-vpn");
@@ -425,7 +425,7 @@
     GNUNET_free (exit_binary);
     fprintf (stderr,
              "WARNING: gnunet-helper-{exit,vpn} binaries are not SUID, 
refusing to run test (as it would have to fail). %d\n", ret);
-    return 0;
+    return 77;
   }
 
   GNUNET_free (vpn_binary);