tange/parallel
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/parallel.git synced 2024-11-22 14:07:55 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://git.sv.gnu.org/srv/git/parallel

Browse source 
Conflicts:
	doc/release_new_version
	src/parallel
	testsuite/wanted-results/parallel-local-3s
	testsuite/wanted-results/parallel-local-ssh2
	testsuite/wanted-results/test15
	testsuite/wanted-results/test19
	testsuite/wanted-results/test37
	testsuite/wanted-results/test61
This commit is contained in:
Ole Tange 2015-01-03 01:29:16 +01:00
parent 6b2811a07f b71d442c1c
commit a83c02c95d
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
doc/release_new_version
View file

@ -252,10 +252,10 @@ New in this release:
* Multithreaded Encryption and Compression http://www.krazyworks.com/multithreaded-encryption-and-compression/ * 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 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. * Bug fixes and man page updates.
GNU Parallel - For people who live life in the parallel lane. GNU Parallel - For people who live life in the parallel lane.

4
testsuite/tests-to-run/niceload03.sh
View file

@ -19,8 +19,8 @@ echo '### niceload with no arguments should give no output'
niceload niceload
echo '### Test -t and -s' echo '### Test -t and -s'
# This should sleep 2*1s and run 2*2s # This should sleep at least 2*1s and run 2*2s
niceload -v -t 1 -s 2 sleep 4.5 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' 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 # This should take 10 seconds to run + delay from niceload