testing

4 files changed, 22 insertions, 8 deletions

diff --git a/test/servers3.exp b/test/servers3.exp
index 20a20a88d..eccdaa1d9 100755
--- a/test/servers3.exp
+++ b/test/servers3.exp
@@ -45,7 +45,7 @@ expect {
 send -- "cat index.html\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "This is the default web page for this server"
+        "DOCTYPE html PUBLIC"
 }
 
 sleep 1
@@ -63,6 +63,13 @@ expect {
         "ppp" {puts "TESTING ERROR 6\n";exit}
         "log"
 }
+sleep 1
+send -- "ls -al /tmp;pwd\r"
+expect {
+        timeout {puts "TESTING ERROR 10\n";exit}
+        "X11-unix" {puts "TESTING ERROR 11\n";exit}
+        "/root"
+}
 sleep 2
 
 puts "\nall done\n"
diff --git a/test/servers6.exp b/test/servers6.exp
index 2179f6f98..9ef4ea514 100755
--- a/test/servers6.exp
+++ b/test/servers6.exp
@@ -45,7 +45,7 @@ expect {
 send -- "cat index.html\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "Welcome to nginx"
+        "DOCTYPE html PUBLIC"
 }
 
 sleep 1
@@ -63,6 +63,13 @@ expect {
         "ppp" {puts "TESTING ERROR 6\n";exit}
         "log"
 }
+sleep 1
+send -- "ls -al /tmp;pwd\r"
+expect {
+        timeout {puts "TESTING ERROR 10\n";exit}
+        "X11-unix" {puts "TESTING ERROR 11\n";exit}
+        "/root"
+}
 sleep 2
 
 puts "\nall done\n"
diff --git a/test/test-root.sh b/test/test-root.sh
index 66096f33a..ee3b7aeb2 100755
--- a/test/test-root.sh
+++ b/test/test-root.sh
@@ -5,6 +5,9 @@
 echo "TESTING: tmpfs"
 ./option_tmpfs.exp
 
+echo "TESTING: profile tmpfs"
+./profile_tmpfs.exp
+
 echo "TESTING: network interfaces"
 ./net_interface.exp
 
@@ -19,7 +22,7 @@ fi
 
 if [ -f /etc/init.d/apache2 ]
 then
-        echo "TESTING: servers apache2, private-dev"
+        echo "TESTING: servers apache2, private-dev, private-tmp"
         ./servers3.exp
 fi
 
@@ -31,13 +34,13 @@ fi
 
 if [ -f /etc/init.d/unbound ]
 then
-        echo "TESTING: servers unbound, private-dev"
+        echo "TESTING: servers unbound, private-dev, private-tmp"
         ./servers5.exp
 fi
 
 if [ -f /etc/init.d/nginx ]
 then
-        echo "TESTING: servers nginx, private-dev"
+        echo "TESTING: servers nginx, private-dev, private-tmp"
         ./servers6.exp
 fi
 
diff --git a/test/test.sh b/test/test.sh
index 985b43af0..ad6599848 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -175,9 +175,6 @@ echo "TESTING: profile rlimit"
 echo "TESTING: profile read-only"
 ./profile_readonly.exp
 
-echo "TESTING: profile tmpfs"
-./profile_tmpfs.exp
-
 echo "TESTING: private"
 ./private.exp `whoami`