Hi!
> diff --git a/testcases/kernel/containers/netns/initialize.sh
> b/testcases/kernel/containers/netns/initialize.sh
> index 5333e7b..a7d8a21 100755
> --- a/testcases/kernel/containers/netns/initialize.sh
> +++ b/testcases/kernel/containers/netns/initialize.sh
> @@ -29,6 +29,8 @@ export TCID=${TCID:-initialize}
> export TST_TOTAL=1
> export TST_COUNT=1
>
> +. test.sh
> +
> TEST_SUBNET=${TEST_SUBNET:=192.168.0}
> i=1
> while [ $i -le 4 ] ; do
> @@ -52,11 +54,6 @@ else
> exit 1
> fi
>
> -IPver=`ip -V | awk -F"-" ' { print $2 } '` ;
> -if ! printf "%s\n%s\n" "ss080417" "$IPver" | sort -c ; then
> - tst_resm TINFO "ip version should be atleast ss080417"
> - exit 1
> -fi
> i=1
> while [ $i -le 6 ] ; do
> mkfifo /tmp/FIFO$i 2> /dev/null
> diff --git a/testcases/kernel/containers/netns/netns_helper.h
> b/testcases/kernel/containers/netns/netns_helper.h
> new file mode 100644
> index 0000000..e7dd528
> --- /dev/null
> +++ b/testcases/kernel/containers/netns/netns_helper.h
> @@ -0,0 +1,71 @@
> +/*
> +* Copyright (c) International Business Machines Corp., 2008
> +* This program is free software; you can redistribute it and/or modify
> +* it under the terms of the GNU General Public License as published by
> +* the Free Software Foundation; either version 2 of the License, or
> +* (at your option) any later version.
> +*
> +* This program is distributed in the hope that it will be useful,
> +* but WITHOUT ANY WARRANTY; without even the implied warranty of
> +* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See
> +* the GNU General Public License for more details.
> +* You should have received a copy of the GNU General Public License
> +* along with this program; if not, write to the Free Software
> +* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> USA
> +*
> +* Author: Veerendra C <[email protected]>
> +*
> +* Net namespaces were introduced around 2.6.25. Kernels before that,
> +* assume they are not enabled. Kernels after that, check for -EINVAL
> +* when trying to use CLONE_NEWNET and CLONE_NEWNS.
> +***************************************************************************/
> +
> +#define _GNU_SOURCE
> +
> +#include <sched.h>
> +#include "config.h"
> +#include "libclone.h"
> +#include "linux_syscall_numbers.h"
> +#include "test.h"
> +
> +#ifndef CLONE_NEWNS
> +#define CLONE_NEWNS -1
> +#endif
> +
> +static void check_iproute(void)
> +{
> + int ret, status;
> + char iprt_script[FILENAME_MAX];
> + char *ltproot;
> +
> + ltproot = getenv("LTPROOT");
> + if (!ltproot)
> + tst_brkm(TCONF, NULL, "LTPROOT env var is not set");
> +
> + if (iprt_script == NULL)
> + tst_brkm(TCONF, NULL, "error while allocating mem");
> +
> + sprintf(iprt_script, "%s/testcases/bin/check_iproute.sh", ltproot);
> + ret = system(iprt_script);
> + status = WEXITSTATUS(ret);
> +
> + if (ret == -1 || status != 0) {
> + if (status == TCONF)
> + tst_brkm(TCONF, NULL,
> + "Configuration error while running the
> script");
> + tst_brkm(TBROK, NULL, "Configuration script failed; status: %d",
> + status);
> + }
> +}
You are guaranteed that path to $LTPROOT/testcases/bin/ is in the $PATH
so that you can run any test executable just by it's filename. Have look
at 2.1.3 in Test Writing Guidelines at:
https://github.com/linux-test-project/ltp/wiki/Test-Writing-Guidelines
Moreover I think that running a shell script from C to parse output from
ip -V is a little too complicated. Can't we just do popen("ip -V") and
the do scanf() on the resulting FILE *?
> +static void check_netns(void)
> +{
> + /* Checking if the kernel supports unshare with netns capabilities. */
> + if (CLONE_NEWNS == -1)
> + tst_brkm(TCONF | TERRNO, NULL, "CLONE_NEWNS (%d) not supported",
> + CLONE_NEWNS);
> + else if (do_clone_unshare_test(T_UNSHARE, CLONE_NEWNET | CLONE_NEWNS,
> + NULL, NULL) == -1)
> + tst_brkm(TCONF | TERRNO, NULL,
> + "unshare syscall smoke test
> failed");
> +}
The tst_brkm() exits test execution, there is no need for the else.
> diff --git a/testcases/kernel/containers/netns/par_chld_ftp.c
> b/testcases/kernel/containers/netns/par_chld_ftp.c
> index 605be19..5c4846c 100644
> --- a/testcases/kernel/containers/netns/par_chld_ftp.c
> +++ b/testcases/kernel/containers/netns/par_chld_ftp.c
> @@ -27,12 +27,27 @@
> *
> =============================================================================*/
>
> #include "common.h"
> +#include "netns_helper.h"
>
> const char *TCID = "par_chld_ftp";
>
> +static void setup(void)
> +{
> + tst_require_root(NULL);
> + check_iproute();
> + check_netns();
> +}
> +
> int main(void)
> {
> int status;
> +
> + setup();
> +
> status = create_net_namespace("par_ftp.sh", "ch_ftp.sh");
> + if (status == 0)
> + tst_resm(TPASS, "create_net_namespace");
> + else
> + tst_resm(TFAIL, "create_net_namespace");
> return status;
It would be a bit better to call tst_exit() here once you started to use
the tst_resm() interface.
> }
> diff --git a/testcases/kernel/containers/netns/par_chld_ftp.sh
> b/testcases/kernel/containers/netns/par_chld_ftp.sh
> new file mode 100755
> index 0000000..f2950ee
> --- /dev/null
> +++ b/testcases/kernel/containers/netns/par_chld_ftp.sh
> @@ -0,0 +1,52 @@
> +#!/bin/bash
> +
> +################################################################################
> +##
> ##
> +## Copyright (c) International Business Machines Corp., 2008
> ##
> +##
> ##
> +## This program is free software; you can redistribute it and#or modify
> ##
> +## it under the terms of the GNU General Public License as published by
> ##
> +## the Free Software Foundation; either version 2 of the License, or
> ##
> +## (at your option) any later version.
> ##
> +##
> ##
> +## This program is distributed in the hope that it will be useful, but
> ##
> +## WITHOUT ANY WARRANTY; without even the implied warranty of
> MERCHANTABILITY ##
> +## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> ##
> +## for more details.
> ##
> +##
> ##
> +## You should have received a copy of the GNU General Public License
> ##
> +## along with this program; if not, write to the Free Software
> ##
> +## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> USA ##
> +##
> ##
> +## Author: Veerendra <[email protected]>
> ##
> +################################################################################
> +
> +export TCID=${TCID:-par_chld_ftp.sh}
> +export TST_COUNT=1
> +export TST_TOTAL=1
> +
> +. cmdlib.sh
> +. test.sh
Including both cmdlib.sh and test.sh will likely collide in some
unexpected way. The cmdlib.sh is deprecated (I should have added a
deprecation warning there). You should include the daemonlib.sh
directly instead. (as described in 2.3.4 in Test Writing Guidelines)
> +flag=0
> +exit_code=0
> +
> +status_daemon vsftpd
> +if [ $? -ne 0 ]; then
> + start_daemon vsftpd
> + if [ $? -ne 0 ]; then
> + TST_CLEANUP=""
> + tst_brkm TCONF "Can't start vsftp"
> + fi
> + flag=1
> +fi
> +
> +par_chld_ftp
> +exit_code=$?
> +
> +if [ $flag -eq 1 ]; then
> + stop_daemon vsftpd
> +fi
> +
> +echo
> +exit $exit_code
Ideally you should use tst_resm after running par_child_ftp and have
tst_exit here instead of the exit.
> diff --git a/testcases/kernel/containers/netns/par_chld_ipv6.c
> b/testcases/kernel/containers/netns/par_chld_ipv6.c
> index f45ce5a..c9f7ad2 100644
> --- a/testcases/kernel/containers/netns/par_chld_ipv6.c
> +++ b/testcases/kernel/containers/netns/par_chld_ipv6.c
> @@ -45,16 +45,26 @@
> #include "test.h"
> #include "config.h"
> #include "common.h"
> +#include "netns_helper.h"
>
> char *TCID = "netns_ipv6";
> int TST_TOTAL = 1;
>
> +static void setup(void)
> +{
> + tst_require_root(NULL);
> + check_iproute();
> + check_netns();
> +}
> +
> int main(void)
> {
> int pid, status = 0, ret;
> long int flags = 0;
> char *ltproot, *par, *child;
>
> + setup();
> +
> flags |= CLONE_NEWNS;
> flags |= CLONE_NEWNET;
>
> @@ -116,6 +126,7 @@ parent & child NS");
> errno);
> status = errno;
> }
> + tst_resm(TPASS, "par child ipv6");
> return status;
> }
> }
> diff --git a/testcases/kernel/containers/netns/runnetnstest.sh
> b/testcases/kernel/containers/netns/runnetnstest.sh
> deleted file mode 100755
> index 15ee006..0000000
> --- a/testcases/kernel/containers/netns/runnetnstest.sh
> +++ /dev/null
> @@ -1,133 +0,0 @@
> -#!/bin/bash
> -
> -################################################################################
> -##
> ##
> -## Copyright (c) International Business Machines Corp., 2008
> ##
> -##
> ##
> -## This program is free software; you can redistribute it and#or modify
> ##
> -## it under the terms of the GNU General Public License as published by
> ##
> -## the Free Software Foundation; either version 2 of the License, or
> ##
> -## (at your option) any later version.
> ##
> -##
> ##
> -## This program is distributed in the hope that it will be useful, but
> ##
> -## WITHOUT ANY WARRANTY; without even the implied warranty of
> MERCHANTABILITY ##
> -## or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
> ##
> -## for more details.
> ##
> -##
> ##
> -## You should have received a copy of the GNU General Public License
> ##
> -## along with this program; if not, write to the Free Software
> ##
> -## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301
> USA ##
> -##
> ##
> -## Author: Veerendra <[email protected]>
> ##
> -################################################################################
> -
> -
> -rc=0
> -exit_code=0
> -
> -# Check the iproute2 version (aka "SnapShot")
> -IPROUTEV=`ip -V | cut -d ',' -f 2 | cut -d '-' -f 2 | sed -e 's/^ss//'`
> -
> -# We need to strip leading 0s else bash thinks we're giving it octal numbers.
> -IPROUTEY=$(echo ${IPROUTEV:0:2} | sed -e 's/^0\+//') # Year
> -IPROUTEM=$(echo ${IPROUTEV:2:2} | sed -e 's/^0\+//') # Month
> -IPROUTED=$(echo ${IPROUTEV:4:2} | sed -e 's/^0\+//') # Day
> -
> -V=$((${IPROUTEY}*12*32 + ${IPROUTEM}*32 + ${IPROUTED}))
> -
> -#
> -# iproute-ss080725 and later support setting the network namespace of an
> -# interface.
> -#
> -NETNSV=$((8*12*32 + 7*32 + 25))
> -if [ ${V} -lt ${NETNSV} ]; then
> - echo "INFO: iproute tools do not support setting network namespaces.
> Skipping network namespace tests."
> - exit $exit_code
> -fi
> -
> -crtchild
> -rc=$?
> -if [ $rc -ne 0 ]; then
> - exit_code=$rc
> - errmesg="crtchild: return code is $exit_code ; "
> - echo $errmesg
> -else
> - echo "crtchild: PASS"
> -fi
> -echo
> -
> -two_children_ns
> -rc=$?
> -if [ $rc -ne 0 ]; then
> - exit_code=$rc
> - errmesg="$errmesg two_children_ns: return code is $exit_code ; "
> - echo $errmesg
> -else
> - echo "two_children_ns: PASS"
> -fi
> -echo
> -
> -crtchild_delchild
> -rc=$?
> -if [ $rc -ne 0 ]; then
> - exit_code=$rc
> - errmesg="$errmesg crtchild_delchild: return code is $exit_code ; "
> - echo $errmesg
> -else
> - echo "crtchild_delchild: PASS"
> -fi
> -echo
> -
> -
> -par_chld_ipv6
> -rc=$?
> -if [ $rc -ne 0 ]; then
> - exit_code=$rc
> - errmesg="$errmesg par_chld_ipv6: return code is $exit_code ; "
> - echo $errmesg
> -else
> - echo "par_chld_ipv6: PASS"
> -fi
> -echo
> -
> -# sysfs tagging does not exist, so this test can't pass. In
> -# fact at the moment it fails when mount -t sysfs none /sys is
> -# refused, fails in a bad state, leaving the system hard to
> -# reboot. Revisit enabling this test when per-container sysfs
> -# views are supported.
> -#sysfsview
> -#rc=$?
> -#if [ $rc -ne 0 ]; then
> -# exit_code=$rc
> -# errmesg="$errmesg sysfsview: return code is $exit_code ; "
> -# echo $errmesg
> -#else
> -# echo "sysfsview: PASS"
> -#fi
> -#echo
> -
> -. cmdlib.sh
> -flag=0
> -
> -status_daemon vsftpd
> -if [ $? -ne 0 ]; then
> - start_daemon vsftpd
> - flag=1
> -fi
> -
> -par_chld_ftp
> -rc=$?
> -if [ $rc -ne 0 ]; then
> - exit_code=$rc
> - errmesg="$errmesg par_chld_ftp: FAIL $exit_code ; "
> - echo $errmesg
> -else
> - echo "par_chld_ftp: PASS"
> -fi
> -
> -if [ $flag -eq 1 ]; then
> - stop_daemon vsftpd
> -fi
> -
> -echo
> -exit $exit_code
> diff --git a/testcases/kernel/containers/netns/two_children_ns.c
> b/testcases/kernel/containers/netns/two_children_ns.c
> index 13ae1e6..00efbec 100644
> --- a/testcases/kernel/containers/netns/two_children_ns.c
> +++ b/testcases/kernel/containers/netns/two_children_ns.c
> @@ -47,10 +47,18 @@
> #include "libclone.h"
> #include "config.h"
> #include "common.h"
> +#include "netns_helper.h"
>
> char *TCID = "netns_2children";
> int TST_TOTAL = 1;
>
> +static void setup(void)
> +{
> + tst_require_root(NULL);
> + check_iproute();
> + check_netns();
> +}
> +
> int main(void)
> {
> int ret, pid[2], status, i;
> @@ -58,6 +66,8 @@ int main(void)
> char *child[2], *par[2];
> char *ltproot;
>
> + setup();
> +
> flags |= CLONE_NEWNS;
> flags |= CLONE_NEWNET;
>
> @@ -133,5 +143,7 @@ int main(void)
> exit(status);
> }
> }
> +
> + tst_resm(TPASS, "two children ns");
> exit(0);
> }
This whole file should be fixed to use tst_resm() and tst_exit() and
should be fixed up not use the absolute paths to run subexecutables.
Can you please fix that too? (ideally in follow up patch).
--
Cyril Hrubis
[email protected]
------------------------------------------------------------------------------
_______________________________________________
Ltp-list mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/ltp-list
