--- ltp/testcases/kernel/containers/container_test.sh	2010-02-22 14:21:40.000000000 -0500
+++ ltp-full-20100228/testcases/kernel/containers/container_test.sh	2010-03-03 11:43:19.000000000 -0500
@@ -10,11 +10,11 @@
 # any later version.
 
 #check_utsns_enabled
-check_for_unshare
-if [ $? -eq 1 ]; then
-	echo "Unshare not supported.  Not running container tests"
-	exit 0
-fi
+#check_for_unshare
+#if [ $? -eq 1 ]; then
+#	echo "Unshare not supported.  Not running container tests"
+#	exit 0
+#fi
 check_utsns_enabled
 if [ $? -eq 0 ]; then
 	echo "Running utsns tests."
@@ -46,11 +46,22 @@ else
 	echo "ipc namespaces not enabled in kernel.  Not running ipcns tests."
 fi
 
-echo "Running pidns tests."
-runpidnstest.sh
+check_pidns_enabled
+if [ $? -eq 0 ]; then
+	echo "Running pidns tests."
+	runpidnstest.sh
+else
+	echo "Process id namespaces not enabled in kernel.  Not running pidns tests."
+fi
 
-echo "Running POSIX message queue tests."
-runmqnstest.sh
+check_mqns_enabled
+if [ $? -eq 0 ]; then
+    echo "Running POSIX message queue tests."
+    runmqnstest.sh
+else
+    echo "Posix message queues or ipc namespaces not enabled in kernel."
+    echo "Not running mqns tests."
+fi
 
 check_netns_enabled
 if [ $? -eq 0 ]; then
@@ -59,4 +70,3 @@ if [ $? -eq 0 ]; then
 else
 	echo "Network namespaces not enabled in kernel.  Not running netns tests."
 fi
-