(l2g_stop): Added a wait statement to avoid creating zombies.

(simple_expect): Added a missing space in a prompt regexp.

src/server/testsuite/config/unix.exp

@@ -14,7 +14,10 @@ proc l2g_start {} {
 proc l2g_stop {} {
     global spawn_id
 
+    # FIXME: send explicit quit command and check that there is no
+    # trailing unexpected output before the "ok, I die" response.
     close
+    wait
 }
 
 proc l2g_send {str} {
@@ -40,7 +43,7 @@ proc simple_expect {regex {testname ""}} {
 	-re "($any*)$nl" {
 	    fail "$test (unexpected line '$expect_out(1,string)' waiting for '$regex')"
 	}
-	-re "($any*)l2g>" {
+	-re "($any*)l2g> " {
 	    fail "$test (unexpected incomplete line '$expect_out(1,string)' waiting for '$regex')"
 	}
     }