diff options
| -rw-r--r-- | test/lisp/eshell/esh-proc-tests.el | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/test/lisp/eshell/esh-proc-tests.el b/test/lisp/eshell/esh-proc-tests.el index a924f932659..730cd9cb39e 100644 --- a/test/lisp/eshell/esh-proc-tests.el +++ b/test/lisp/eshell/esh-proc-tests.el | |||
| @@ -365,7 +365,12 @@ write the exit status to the pipe. See bug#54136." | |||
| 365 | (string-match (rx (group (+ digit)) eol) (eshell-last-output)) | 365 | (string-match (rx (group (+ digit)) eol) (eshell-last-output)) |
| 366 | (let ((pid (match-string 1 (eshell-last-output)))) | 366 | (let ((pid (match-string 1 (eshell-last-output)))) |
| 367 | (should (= (length eshell-process-list) 1)) | 367 | (should (= (length eshell-process-list) 1)) |
| 368 | (eshell-insert-command (format "kill %s" pid)) | 368 | (eshell-insert-command |
| 369 | (format "kill %s%s" | ||
| 370 | ;; On MS-Windows we cannot kill a sleeping program except | ||
| 371 | ;; with SIGKILL. | ||
| 372 | (if (eq system-type 'windows-nt) "-9 " "") | ||
| 373 | pid)) | ||
| 369 | (should (= eshell-last-command-status 0)) | 374 | (should (= eshell-last-command-status 0)) |
| 370 | (eshell-wait-for-subprocess t) | 375 | (eshell-wait-for-subprocess t) |
| 371 | (should (= (length eshell-process-list) 0))))) | 376 | (should (= (length eshell-process-list) 0))))) |
| @@ -376,7 +381,10 @@ write the exit status to the pipe. See bug#54136." | |||
| 376 | (with-temp-eshell | 381 | (with-temp-eshell |
| 377 | (eshell-insert-command "sleep 100 &") | 382 | (eshell-insert-command "sleep 100 &") |
| 378 | (should (= (length eshell-process-list) 1)) | 383 | (should (= (length eshell-process-list) 1)) |
| 379 | (eshell-insert-command "kill (caar eshell-process-list)") | 384 | (eshell-insert-command |
| 385 | ;; On MS-Windows we cannot kill a sleeping program except with SIGKILL. | ||
| 386 | (format "kill %s(caar eshell-process-list)" | ||
| 387 | (if (eq system-type 'windows-nt) "-9 " ""))) | ||
| 380 | (should (= eshell-last-command-status 0)) | 388 | (should (= eshell-last-command-status 0)) |
| 381 | (eshell-wait-for-subprocess t) | 389 | (eshell-wait-for-subprocess t) |
| 382 | (should (= (length eshell-process-list) 0)))) | 390 | (should (= (length eshell-process-list) 0)))) |