diff --git a/doc/release_new_version b/doc/release_new_version index c44e590a..aa0c63f5 100644 --- a/doc/release_new_version +++ b/doc/release_new_version @@ -252,10 +252,10 @@ New in this release: * Multithreaded Encryption and Compression http://www.krazyworks.com/multithreaded-encryption-and-compression/ -* コマンドを並列に実行するGNU parallelがとても便利 http://bicycle1885.hatenablog.com/entry/2014/08/10/143612 - * GNU Parallel on OSX and Linux https://darknightelf.wordpress.com/2015/01/01/gnu-parallel-on-osx/ +* コマンドを並列に実行するGNU parallelがとても便利 http://bicycle1885.hatenablog.com/entry/2014/08/10/143612 + * Bug fixes and man page updates. GNU Parallel - For people who live life in the parallel lane. diff --git a/testsuite/tests-to-run/niceload03.sh b/testsuite/tests-to-run/niceload03.sh index 979875c7..be2d9835 100755 --- a/testsuite/tests-to-run/niceload03.sh +++ b/testsuite/tests-to-run/niceload03.sh @@ -19,8 +19,8 @@ echo '### niceload with no arguments should give no output' niceload echo '### Test -t and -s' - # This should sleep 2*1s and run 2*2s - niceload -v -t 1 -s 2 sleep 4.5 + # This should sleep at least 2*1s and run 2*2s + stdout niceload -v -t 1 -s 2 sleep 4.5 | head -n 4 echo 'bug #38908: niceload: Ctrl-C/TERM should resume jobs if using -p - Order may change, but not output' # This should take 10 seconds to run + delay from niceload