Merge branch 'patches/pike196' into 8.0

* patches/pike196:
  Tools.Standalone.test_pike: Do not close stdin.

lib/modules/Tools.pmod/Standalone.pmod/test_pike.pike

@@ -268,7 +268,11 @@ class Watchdog
       WATCHDOG_MSG ("Error reading stdin pipe: %s\n",
 		    strerror (stdin->errno()));
     }
+    if (!timeout_phase) {
       _exit(EXIT_OK);
+    } else {
+      _exit(EXIT_WATCHDOG_FAILED);
+    }
   }
 
   void check_parent_pid()
@@ -309,7 +313,6 @@ class Watchdog
 	  }
 	  WATCHDOG_MSG ("%s: Sending SIGABRT to %d.\n", ts, watched_pid);
 	  kill(watched_pid, signum("SIGABRT"));
-	  stdin->close();
 	  timeout_phase = 1;
 	  call_out (timeout, 60);
 	  break;