[LTP] [PATCH] containers/netns/: fix kernel supporting check

[Guangwen Feng]

On RHEL5.11GA, test result should be TCONF but not TFAIL since
setns() is not supported, so fix this.

Signed-off-by: Guangwen Feng <fenggw-fnst@cn.fujitsu.com>
---
 testcases/kernel/containers/netns/netns_helper.sh | 8 +++++++-
 testcases/kernel/containers/netns/netns_sysfs.sh  | 9 ++++++++-
 testcases/kernel/containers/share/ns_exec.c       | 6 ++----
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/testcases/kernel/containers/netns/netns_helper.sh b/testcases/kernel/containers/netns/netns_helper.sh
index cea1541..f9d6cba 100755
--- a/testcases/kernel/containers/netns/netns_helper.sh
+++ b/testcases/kernel/containers/netns/netns_helper.sh
@@ -188,8 +188,14 @@ netns_ns_exec_setup()
 		tst_brkm TBROK "unable to create a new network namespace"
 	fi
 
-	$NS_EXEC $NS_HANDLE0 ip link add veth0 type veth peer name veth1 || \
+	$NS_EXEC $NS_HANDLE0 ip link add veth0 type veth peer name veth1
+	if [ $? -eq 32 ]; then
+		tst_brkm TCONF "setns not supported"
+	fi
+
+	if [ $? -ne 0 ]; then
 		tst_brkm TBROK "unable to create veth pair devices"
+	fi
 
 	$NS_EXEC $NS_HANDLE0 ns_ifmove veth1 $NS_HANDLE1
 	if [ $? -eq 0 ]; then
diff --git a/testcases/kernel/containers/netns/netns_sysfs.sh b/testcases/kernel/containers/netns/netns_sysfs.sh
index c10fa36..6c95a7d 100755
--- a/testcases/kernel/containers/netns/netns_sysfs.sh
+++ b/testcases/kernel/containers/netns/netns_sysfs.sh
@@ -43,8 +43,15 @@ TST_CLEANUP=cleanup
 ls /sys/class/net >sysfs_before
 
 
-ns_exec $NS_HANDLE ip link add dummy0 type dummy || \
+ns_exec $NS_HANDLE ip link add dummy0 type dummy
+if [ $? -eq 32 ]; then
+	tst_brkm TCONF "setns not supported"
+fi
+
+if [ $? -ne 0 ]; then
 	tst_brkm TBROK "failed to add a new dummy device"
+fi
+
 ns_exec $NS_HANDLE mount -t sysfs none /sys 2>/dev/null
 
 ns_exec $NS_HANDLE test -d /sys/class/net/dummy0
diff --git a/testcases/kernel/containers/share/ns_exec.c b/testcases/kernel/containers/share/ns_exec.c
index e2f068c..9148b46 100644
--- a/testcases/kernel/containers/share/ns_exec.c
+++ b/testcases/kernel/containers/share/ns_exec.c
@@ -86,10 +86,8 @@ int main(int argc, char *argv[])
 	int i, rv, pid;
 
 	rv = syscall(__NR_setns, -1, 0);
-	if (rv == -1 && errno == ENOSYS) {
-		tst_resm(TINFO, "setns is not supported in the kernel");
-		return 1;
-	}
+	if (rv == -1 && errno == ENOSYS)
+		tst_brkm(TCONF, NULL, "setns is not supported in the kernel");
 
 	if (argc < 3) {
 		tst_resm(TINFO, "%s <NS_PID> <PROGRAM> [ARGS]\n", argv[0]);
-- 
1.8.4.2