simplify wrapper script

5 files changed, 32 insertions, 22 deletions

diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index 01e6e9618..4eb089997 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -5,6 +5,7 @@ dist_pkgdata_DATA = \
   netjail/netjail_core.sh \
   netjail/netjail_start.sh \
   netjail/netjail_stop.sh \
+  netjail/netjail_test_master.sh \
   netjail/topo.sh \
   testing-ng/block.sh
 
@@ -19,10 +20,11 @@ EXTRA_DIST = \
         sphinx_update.sh
 
 install-data-hook:
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_core.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_start.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/netjail_stop.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/topo.sh'
-        chmod o+x '$(DESTDIR)$(pkgdatadir)/block.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_core.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_start.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_stop.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/netjail_test_master.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/topo.sh'
+        chmod +x '$(DESTDIR)$(pkgdatadir)/block.sh'
 
 ## EOF
diff --git a/scripts/netjail/netjail_test_master.sh b/scripts/netjail/netjail_test_master.sh
new file mode 100644
index 000000000..4209a235f
--- /dev/null
+++ b/scripts/netjail/netjail_test_master.sh
@@ -0,0 +1,18 @@
+#!/bin/bash
+if ! [ -d "/run/netns" ];
+then
+    echo "You have to create the directory '/run/netns'."
+    exit 77
+fi
+if [ -f /proc/sys/kernel/unprivileged_userns_clone ];
+then
+    if [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ];
+    then
+        echo -e "Error during test setup: The kernel parameter 'kernel.unprivileged_userns_clone' has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
+        exit 77
+    fi
+else
+    echo -e "Error during test setup: The kernel lacks the parameter 'kernel.unprivileged_userns_clone'\n"
+    exit 77
+fi
+exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; $@"
diff --git a/src/lib/testing/test_testing_api.c b/src/lib/testing/test_testing_api.c
index 6684dccb9..2a5b614fd 100644
--- a/src/lib/testing/test_testing_api.c
+++ b/src/lib/testing/test_testing_api.c
@@ -54,11 +54,7 @@ main (int argc,
   struct GNUNET_TESTING_Command netjail[] = {
     GNUNET_TESTING_cmd_load_topology_from_string (
       "load-topology",
-      ""),
-    GNUNET_TESTING_cmd_netjail_setup (
-      "netjail-setup",
-      GNUNET_TESTING_NETJAIL_START_SCRIPT,
-      "load-topology"),
+      ""), // try "M"
     GNUNET_TESTING_cmd_end ()
   };
   struct GNUNET_TESTING_Command commands[] = {
diff --git a/src/lib/testing/testing_api_cmd_netjail_start.c b/src/lib/testing/testing_api_cmd_netjail_start.c
index 6b25f6902..8a84b2769 100644
--- a/src/lib/testing/testing_api_cmd_netjail_start.c
+++ b/src/lib/testing/testing_api_cmd_netjail_start.c
@@ -151,14 +151,15 @@ netjail_start_run (void *cls,
                    ns->script);
   helper_check = GNUNET_OS_check_helper_binary (
     script_name,
-    GNUNET_YES,
+    true,
     NULL);
   if (GNUNET_NO == helper_check)
   {
     GNUNET_log (GNUNET_ERROR_TYPE_ERROR,
                 "No SUID for %s!\n",
                 script_name);
-    GNUNET_TESTING_FAIL (is);
+    GNUNET_TESTING_interpreter_skip (is);
+    return;
   }
   if (GNUNET_SYSERR == helper_check)
   {
diff --git a/src/service/transport/test_transport_simple_send.sh b/src/service/transport/test_transport_simple_send.sh
index 0250070be..af7515753 100755
--- a/src/service/transport/test_transport_simple_send.sh
+++ b/src/service/transport/test_transport_simple_send.sh
@@ -1,11 +1,4 @@
 #!/bin/bash
-if ! [ -d "/run/netns" ]; then
-    echo You have to create the directory /run/netns.
-fi
-if [ -f /proc/sys/kernel/unprivileged_userns_clone ]; then
-  if  [ "$(cat /proc/sys/kernel/unprivileged_userns_clone)" != 1 ]; then
-    echo -e "Error during test setup: The kernel parameter kernel.unprivileged_userns_clone has to be set to 1! One has to execute\n\n sysctl kernel.unprivileged_userns_clone=1\n"
-    exit 78
-  fi
-fi
-exec unshare -r -nmU bash -c "mount -t tmpfs --make-rshared tmpfs /run/netns; ./test_transport_start_with_config test_transport_simple_send_topo.conf"
+exec netjail_test_master.sh ./test_transport_start_with_config test_transport_simple_send_topo.conf
+
+# exec netjail_test_master.sh gnunet-testing-netjail-launcher test_transport_simple_send_topo.conf