support for kde and server programs

5 files changed, 22 insertions, 23 deletions

diff --git a/test/fs_chroot.exp b/test/fs_chroot.exp
index 4ddf8d32a..cc0d82179 100755
--- a/test/fs_chroot.exp
+++ b/test/fs_chroot.exp
@@ -54,7 +54,7 @@ sleep 1
 send -- "ps aux |wc -l; pwd\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "5"
+        "6"
 }
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
diff --git a/test/ignore.exp b/test/ignore.exp
index ab7f0655f..8f8076fb3 100755
--- a/test/ignore.exp
+++ b/test/ignore.exp
@@ -30,7 +30,7 @@ sleep 1
 send -- "ps aux | wc -l\r"
 expect {
         timeout {puts "TESTING ERROR 4\n";exit}
-        "4"
+        "5"
 }
 sleep 1
 send -- "exit\r"
diff --git a/test/option-trace.exp b/test/option-trace.exp
index b20ef9ef9..6fd113e2b 100755
--- a/test/option-trace.exp
+++ b/test/option-trace.exp
@@ -11,17 +11,17 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "1:bash:open /dev/tty" {puts "64bit\n"}
-        "1:bash:open64 /dev/tty" {puts "32bit\n"}
+        "bash:open /dev/tty" {puts "64bit\n"}
+        "bash:open64 /dev/tty" {puts "32bit\n"}
 }
 expect {
         timeout {puts "TESTING ERROR 2\n";exit}
-        "1:bash:fopen /etc/passwd"
+        "bash:fopen /etc/passwd"
 }
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "1:bash:access /etc/terminfo/x/xterm" {puts "debian\n"}
-        "1:bash:access /usr/share/terminfo/x/xterm" {puts "arch\n"}
+        "bash:access /etc/terminfo/x/xterm" {puts "debian\n"}
+        "bash:access /usr/share/terminfo/x/xterm" {puts "arch\n"}
 }
 
 sleep 1
diff --git a/test/pid.exp b/test/pid.exp
index 0baf3af0e..d382feb96 100755
--- a/test/pid.exp
+++ b/test/pid.exp
@@ -37,7 +37,7 @@ sleep 1
 send -- "ps aux |wc -l; pwd\r"
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "5"
+        "6"
 }
 expect {
         timeout {puts "TESTING ERROR 6\n";exit}
diff --git a/test/trace.exp b/test/trace.exp
index 2b5003d83..21dd6a559 100755
--- a/test/trace.exp
+++ b/test/trace.exp
@@ -11,7 +11,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 1\n";exit}
-        "1:mkdir:mkdir ttt"
+        "mkdir:mkdir ttt"
 }
 sleep 1
 
@@ -22,7 +22,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 3\n";exit}
-        "1:rmdir:rmdir ttt"
+        "rmdir:rmdir ttt"
 }
 sleep 1
 
@@ -33,8 +33,8 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 5\n";exit}
-        "1:touch:open ttt" {puts "OK\n";}
-        "1:touch:open64 ttt" {puts "OK\n";}
+        "touch:open ttt" {puts "OK\n";}
+        "touch:open64 ttt" {puts "OK\n";}
 }
 sleep 1
 
@@ -45,7 +45,7 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 7\n";exit}
-        "1:rm:unlinkat ttt"
+        "rm:unlinkat ttt"
 }
 sleep 1
 
@@ -56,26 +56,26 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 8.2\n";exit}
-        "1:bash:open /dev/tty" {puts "OK\n";}
-        "1:bash:open64 /dev/tty" {puts "OK\n";}
+        "bash:open /dev/tty" {puts "OK\n";}
+        "bash:open64 /dev/tty" {puts "OK\n";}
 }
 expect {
         timeout {puts "TESTING ERROR 8.3\n";exit}
-        "1:wget:fopen64 /etc/wgetrc" {puts "OK\n";}
-        "1:wget:fopen /etc/wgetrc"  {puts "OK\n";}
+        "wget:fopen64 /etc/wgetrc" {puts "OK\n";}
+        "wget:fopen /etc/wgetrc"  {puts "OK\n";}
 }
 expect {
         timeout {puts "TESTING ERROR 8.4\n";exit}
-        "1:wget:fopen /etc/hosts"
+        "wget:fopen /etc/hosts"
 }
 expect {
         timeout {puts "TESTING ERROR 8.5\n";exit}
-        "1:wget:connect"
+        "wget:connect"
 }
 expect {
         timeout {puts "TESTING ERROR 8.6\n";exit}
-        "1:wget:fopen64 index.html" {puts "OK\n";}
-        "1:wget:fopen index.html" {puts "OK\n";}
+        "wget:fopen64 index.html" {puts "OK\n";}
+        "wget:fopen index.html" {puts "OK\n";}
 }
 sleep 1
 
@@ -86,10 +86,9 @@ expect {
 }
 expect {
         timeout {puts "TESTING ERROR 10\n";exit}
-        "1:rm:unlinkat index.html"
+        "rm:unlinkat index.html"
 }
 sleep 1
 
 
 puts "\nall done\n"
-