diff --git a/.gitignore b/.gitignore index 026e3db0..d5896c93 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later *~ *.pdf diff --git a/.reuse/dep5 b/.reuse/dep5 index a7b160d5..a6c27f27 100644 --- a/.reuse/dep5 +++ b/.reuse/dep5 @@ -4,7 +4,7 @@ Upstream-Contact: Ole Tange, http://ole.tange.dk Source: https://git.savannah.gnu.org/git/parallel.git Files: testsuite/input-files/testdir/* testsuite/input-files/testdir2/* testsuite/wanted-results/* testsuite/testdir/* packager/obs/* src/optional/* packager/debian/debian-template/* configure config.h.in aclocal.m4 install-sh missing testsuite/input-files/random_dirs_no_newline.tar.bz2 testsuite/input-files/random_dirs_with_newline.tar.bz2 -Copyright: 2007-2021 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. +Copyright: 2007-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. License: GPL-3.0-or-later Files: packager/0install/* @@ -12,7 +12,7 @@ Copyright: 2010-2021 Tim Cuthbertson License: GPL-3.0-or-later Files: doc/citation-notice-faq.txt CREDITS NEWS README src/parallel_cheat_bw.fodt packager/debian/README doc/parallel*directive doc/screenshot.png -Copyright: 2007-2021 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. +Copyright: 2007-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. License: GFDL-1.3-or-later License: CC-BY-SA-4.0 @@ -21,5 +21,5 @@ Copyright: Perl is Copyright (C) 1993-2010 by Larry Wall and others. License: GPL-3.0-or-later Files: testsuite/input-files/xargs-inputs/* -Copyright: Copyright (C) 1998-2021 Free Software Foundation, Inc. +Copyright: Copyright (C) 1998-2022 Free Software Foundation, Inc. License: GPL-3.0-or-later diff --git a/10seconds_install b/10seconds_install index 6a0e6f57..87fadb95 100644 --- a/10seconds_install +++ b/10seconds_install @@ -26,7 +26,7 @@ true <<'EOF'



EOF -# SPDX-FileCopyrightText: 2013-2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2013-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later # diff --git a/CITATION b/CITATION index 2c9420c9..7c92f41b 100644 --- a/CITATION +++ b/CITATION @@ -20,6 +20,6 @@ Or: This helps funding further development. -SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. SPDX-License-Identifier: GFDL-1.3-or-later SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/CITATION.cff b/CITATION.cff new file mode 100644 index 00000000..44e7cc06 --- /dev/null +++ b/CITATION.cff @@ -0,0 +1,15 @@ +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-License-Identifier: GFDL-1.3-or-later +# SPDX-License-Identifier: CC-BY-SA-4.0 + +cff-version: 1.2.0 +title: GNU Parallel 2018 +message: >- + If you use this software, please cite it using the + metadata from this file. +type: software +authors: + - given-names: Ole + family-names: Tange + email: ole@tange.dk + orcid: 'https://orcid.org/0000-0002-6345-1437' diff --git a/Makefile.am b/Makefile.am index 37fe3344..1fa254b9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2002-2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2002-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/Makefile.in b/Makefile.in index dc0936b0..efd9da9f 100644 --- a/Makefile.in +++ b/Makefile.in @@ -14,7 +14,7 @@ @SET_MAKE@ -# SPDX-FileCopyrightText: 2002-2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2002-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later VPATH = @srcdir@ diff --git a/README b/README index efeafe79..c157dda0 100644 --- a/README +++ b/README @@ -143,5 +143,5 @@ the important ones: opkg install perlbase-getopt perlbase-ipc procps-ng-ps perlbase-mime -SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. SPDX-License-Identifier: GPL-3.0-or-later diff --git a/bootstrap b/bootstrap index 2a40376f..a1d269a0 100755 --- a/bootstrap +++ b/bootstrap @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later autoreconf --install -W gnu && diff --git a/doc/FUTURE_IDEAS b/doc/FUTURE_IDEAS index 23adf8f4..f318693d 100644 --- a/doc/FUTURE_IDEAS +++ b/doc/FUTURE_IDEAS @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later niceload seeks last column: diff --git a/doc/boxplot-overhead b/doc/boxplot-overhead index b95385fc..c78e2670 100644 --- a/doc/boxplot-overhead +++ b/doc/boxplot-overhead @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later # Create a boxplot of running 1000 jobs 10 times on all released diff --git a/doc/citation-notice-faq.txt b/doc/citation-notice-faq.txt index f57bad08..fcd5c617 100644 --- a/doc/citation-notice-faq.txt +++ b/doc/citation-notice-faq.txt @@ -21,7 +21,7 @@ single solution that just works: * https://stackoverflow.blog/2021/01/07/open-source-has-a-funding-problem/ * https://www.slideshare.net/NadiaEghbal/consider-the-maintainer * https://www.youtube.com/watch?v=vTsc1m78BUk -* https://blog.licensezero.com/2019/08/24/process-of-elimination.html +* https://web.archive.org/web/20210203105621/https://blog.licensezero.com/2019/08/24/process-of-elimination.html * https://www.numfocus.org/blog/why-is-numpy-only-now-getting-funded/ @@ -65,8 +65,8 @@ Run this once: parallel --citation It takes less than 10 seconds to do and is thus comparable to an -'OK. Do not show this again'-dialog box seen in Firefox and similar -programs. +'OK. Do not show this again'-dialog box seen in LibreOffice, Firefox +and similar programs. It is even optional to run this, as GNU Parallel will work without having 'parallel --citation' run first (in other words it is _not_ @@ -90,12 +90,15 @@ suggests a way of citing, use that. * https://libguides.mit.edu/c.php?g=551454&p=3900280 * https://www.software.ac.uk/how-cite-software * https://aut.ac.nz.libguides.com/APA6th/software -* https://libguides.rgu.ac.uk/c.php?g=380081&p=2983956 +* https://library.rgu.ac.uk/RGUvancouver/computer-programmes * https://journals.aas.org/policy-statement-on-software/ * https://guides.lib.monash.edu/c.php?g=219786&p=1454293 -* https://www.maxqda.com/how-to-cite-maxqda +* https://www.maxqda.com/blogpost/how-to-cite-maxqda * https://docs.github.com/en/github/creating-cloning-and-archiving-repositories/creating-a-repository-on-github/about-citation-files +The CITATION.cff file format was designed to make it easy to cite +software. + If you feel the benefit from using GNU Parallel is too small to warrant a citation, then prove that by simply using another tool. If you replace your use of GNU Parallel with another tool, you obviously @@ -109,7 +112,7 @@ big enough to warrant a citation. Here are other examples of software showing how to cite. Some of these refer to peer-reviewed articles - others do not: -* https://www.scipy.org/citing.html +* https://scipy.org/citing-scipy/ * https://octave.org/doc/interpreter/Citing-Octave-in-Publications.html (Octave has citation for individual packages, too) * https://stat.ethz.ch/pipermail/r-help/2008-May/161481.html @@ -117,7 +120,7 @@ refer to peer-reviewed articles - others do not: (R has citation for individual packages, too) * http://www.partek.com/citing-partek-software-in-a-publication/ * http://www.fluortools.com/misc/cite -* https://www.maxqda.com/how-to-cite-maxqda +* https://www.maxqda.com/blogpost/how-to-cite-maxqda * https://www.open-mpi.org/papers/ * https://www.tensorflow.org/about/bib * http://www.fon.hum.uva.nl/paul/praat.html @@ -130,21 +133,27 @@ Yes. GNU Parallel is released under GNU GPLv3 and thus you are allowed to fork the code. But you have to make sure that your forked version cannot be confused with the original, so for one thing you cannot call it anything similar to GNU Parallel as that would cause confusion -between your forked version and the original. Also documentation -cannot be confused with the documentation for GNU Parallel. This is -also why we have CentOS (and not RedHat Free), and IceCat (and not -Firefox Free). This is also covered in DFSG ("The license may require -derived works to carry a different name or version number from the -original software"). +between your forked version and the original. + +It should be clear to your users, that they are using a fork and that +they should go to you for support and not the GNU Parallel community. + +The documentation must also be changed so it cannot be confused with +the documentation for GNU Parallel. + +The requirement of avoiding confusion is also why we have CentOS (and +not RedHat Free), and IceCat (and not Firefox Free). This is also +covered in DFSG ("The license may require derived works to carry a +different name or version number from the original software"). This principle has even been tested in court: http://www.inta.org/INTABulletin/Pages/GERMANYGeneralPublicLicenseDoesNotPermitUseofThird-PartyTrademarksforAdvertisingModifiedVersionsofOpen-SourceSoftware.aspx https://www.admody.com/urteilsdatenbank/cafe6fdaeed3/OLG-Duesseldorf_Urteil_vom_28-September-2010_Az_I-20-U-41-09 -Also know that if you fork GNU Parallel and remove the notice, you are -not helping to fund further develpment. So if you like GNU Parallel -and do not want to see it wither away like many of the competitors, -then this is a bad idea, as it will lead to less funding. +Please know that if you fork GNU Parallel and remove the notice, you +are not helping to fund further develpment. So if you like GNU +Parallel and do not want to see it wither away like many of the +competitors, then this is a bad idea, as it will lead to less funding. == How important is the notice for the survival of GNU Parallel? == @@ -179,10 +188,9 @@ pay me a normal salary, I will be happy to remove the citation notice. The citation notice is about (indirect) funding - nothing else. -== I do not think it is fair having to cite == +== I do not want to cite == -If the inconvenience of having to cite is too big for you, then you -should use another tool. +If you do not want to cite, then you should use another tool. If you do not want to help fund GNU Parallel, then you will not be a happy GNU Parallel user, and thus you using another tool is the best @@ -217,12 +225,12 @@ If you care so little about GNU Parallel that you do not want to help finance development, then you should contemplate whether GNU Parallel is really the right tool for you. -It is, however, doable (e.g. by forking and changing the code). But -you will be going against the wishes of the author, because you make -it harder to make a living, thus you will be making it harder to -justify producing more free software. If you like GNU Parallel and -want to see it maintained in the future, then this is not the way to -go. +It is, however, doable (e.g. by forking and changing the code; see +above). But you will be going against the wishes of the author, +because you make it harder to make a living, thus you will be making +it harder to justify producing more free software. If you like GNU +Parallel and want to see it maintained in the future, then this is not +the way to go. Maybe it is you Nadia Eghbal addresses in https://www.slideshare.net/NadiaEghbal/consider-the-maintainer: diff --git a/doc/haikus b/doc/haikus index 92b85a97..19df87b0 100644 --- a/doc/haikus +++ b/doc/haikus @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GFDL-1.3-or-later # SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/doc/pod2savannah_publicinfo b/doc/pod2savannah_publicinfo index fc1ef01e..37c4c6be 100644 --- a/doc/pod2savannah_publicinfo +++ b/doc/pod2savannah_publicinfo @@ -1,6 +1,6 @@ #!/usr/bin/perl -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later $line=""; diff --git a/doc/promo b/doc/promo index e4fd4a7c..a3ef64d3 100644 --- a/doc/promo +++ b/doc/promo @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GFDL-1.3-or-later # SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/doc/release_new_version b/doc/release_new_version index e92f3c67..a11b407b 100644 --- a/doc/release_new_version +++ b/doc/release_new_version @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GFDL-1.3-or-later # SPDX-License-Identifier: CC-BY-SA-4.0 @@ -254,16 +254,15 @@ from:tange@gnu.org to:parallel@gnu.org, bug-parallel@gnu.org stable-bcc: Jesse Alama -Subject: GNU Parallel 20211222 ('Støjberg') released [stable] +Subject: GNU Parallel 20220122 ('James Webb/Tutu/Pillar of Shame<<>>') released <<[stable]>> -GNU Parallel 20211222 ('Støjberg') [stable] has been released. It is available for download at: lbry://@GnuParallel:4 +GNU Parallel 20220122 ('<<>>') <<[stable]>> has been released. It is available for download at: lbry://@GnuParallel:4 -No new functionality was introduced so this is a good candidate for a stable release. +<> Quote of the month: - My favorite man page is that of GNU parallel. - -- Jeroen Janssens @jeroenhjanssens@twitter + <<>> New in this release: @@ -271,16 +270,11 @@ New in this release: News about GNU Parallel: -* The first version of Parallel will be 20 years on 2022-01-06 - -* HerrComp Intro HPC gnu parallel https://www.youtube.com/watch?v=tcgjKWfgWQY - -* 多数のファイルを処理する場合の工夫 https://qiita.com/toramili/items/44a770cfb9ef1edc9e26 - -* How To Install parallel on Ubuntu 20.04 https://installati.one/ubuntu/20.04/parallel/ - -* Distributing embarrassingly parallel tasks GNU Parallel https://ulhpc-tutorials.readthedocs.io/en/latest/sequential/gnu-parallel/ +* https://morioh.com/p/a01b883dc57c +https://sachachua.com/blog/2021/12/re-encoding-the-emacsconf-videos-with-ffmpeg-and-gnu-parallel/ +https://learntutorials.net/ja/bash/topic/10778/%E5%B9%B3%E8%A1%8C +<<>> Get the book: GNU Parallel 2018 http://www.lulu.com/shop/ole-tange/gnu-parallel-2018/paperback/product-23558902.html diff --git a/packager/0install/check b/packager/0install/check index cea3ea62..b4e64aad 100755 --- a/packager/0install/check +++ b/packager/0install/check @@ -1,6 +1,6 @@ #!/bin/sh -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later 0launch http://0install.net/2007/interfaces/FeedLint.xml http://git.savannah.gnu.org/cgit/parallel.git/plain/packager/0install/parallel.xml diff --git a/packager/0install/update b/packager/0install/update index 87126428..1fb3d651 100755 --- a/packager/0install/update +++ b/packager/0install/update @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later version=$1 diff --git a/packager/centos/install-parallel-centos-5.sh b/packager/centos/install-parallel-centos-5.sh index c86c1924..726a5911 100755 --- a/packager/centos/install-parallel-centos-5.sh +++ b/packager/centos/install-parallel-centos-5.sh @@ -18,7 +18,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/packager/debian/Makefile b/packager/debian/Makefile index e8294c33..0a34e72e 100644 --- a/packager/debian/Makefile +++ b/packager/debian/Makefile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/packager/debian/debian-template/copyright b/packager/debian/debian-template/copyright index 771231b1..5467b5e0 100644 --- a/packager/debian/debian-template/copyright +++ b/packager/debian/debian-template/copyright @@ -10,7 +10,7 @@ Upstream Author: Copyright: Copyright (C) 2007,2008,2009,2010 Ole Tange, http://ole.tange.dk - SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. + SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. SPDX-License-Identifier: GPL-3.0-or-later License: diff --git a/packager/debian/doc/index.html b/packager/debian/doc/index.html index 148bb14c..058e9f39 100644 --- a/packager/debian/doc/index.html +++ b/packager/debian/doc/index.html @@ -2,7 +2,7 @@ diff --git a/packager/releasescripts/updateversion b/packager/releasescripts/updateversion index c2d1a827..140b8b06 100755 --- a/packager/releasescripts/updateversion +++ b/packager/releasescripts/updateversion @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later updater() { diff --git a/src/Makefile.am b/src/Makefile.am index eb2e4239..95766761 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2002-2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2002-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/christmastree b/src/christmastree index e180735b..1100201e 100644 --- a/src/christmastree +++ b/src/christmastree @@ -18,7 +18,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later =head1 NAME diff --git a/src/env_parallel b/src/env_parallel index 1059e166..b60ebfa6 100755 --- a/src/env_parallel +++ b/src/env_parallel @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later grepq() { diff --git a/src/env_parallel.ash b/src/env_parallel.ash index 357bdb65..5211b353 100755 --- a/src/env_parallel.ash +++ b/src/env_parallel.ash @@ -7,7 +7,7 @@ # after which 'env_parallel' works # # -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later env_parallel() { @@ -386,7 +386,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then echo "parset 20211222 (GNU parallel `parallel --minversion 1`)" - echo "Copyright (C) 2007-2021 Ole Tange, http://ole.tange.dk and Free Software" + echo "Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " echo "This is free software: you are free to change and redistribute it." diff --git a/src/env_parallel.bash b/src/env_parallel.bash index 2e3ecde2..535d1604 100755 --- a/src/env_parallel.bash +++ b/src/env_parallel.bash @@ -7,7 +7,7 @@ # after which 'env_parallel' works # # -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later env_parallel() { @@ -385,7 +385,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then echo "parset 20211222 (GNU parallel `parallel --minversion 1`)" - echo "Copyright (C) 2007-2021 Ole Tange, http://ole.tange.dk and Free Software" + echo "Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " echo "This is free software: you are free to change and redistribute it." diff --git a/src/env_parallel.csh b/src/env_parallel.csh index 167ff595..b36e4beb 100755 --- a/src/env_parallel.csh +++ b/src/env_parallel.csh @@ -7,7 +7,7 @@ # after which 'env_parallel' works # # -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later set _parallel_exit_CODE=0 diff --git a/src/env_parallel.dash b/src/env_parallel.dash index 55430e81..da668dd5 100755 --- a/src/env_parallel.dash +++ b/src/env_parallel.dash @@ -7,7 +7,7 @@ # after which 'env_parallel' works # # -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later env_parallel() { @@ -386,7 +386,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then echo "parset 20211222 (GNU parallel `parallel --minversion 1`)" - echo "Copyright (C) 2007-2021 Ole Tange, http://ole.tange.dk and Free Software" + echo "Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " echo "This is free software: you are free to change and redistribute it." diff --git a/src/env_parallel.fish b/src/env_parallel.fish index c9009f6b..f4568e7a 100755 --- a/src/env_parallel.fish +++ b/src/env_parallel.fish @@ -7,7 +7,7 @@ # after which 'env_parallel' works # # -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later # If you are a fisherman feel free to improve the code diff --git a/src/env_parallel.ksh b/src/env_parallel.ksh index 4d3e5bc6..514b40bd 100755 --- a/src/env_parallel.ksh +++ b/src/env_parallel.ksh @@ -7,7 +7,7 @@ # after which 'env_parallel' works # # -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later env_parallel() { @@ -364,7 +364,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then echo "parset 20211222 (GNU parallel `parallel --minversion 1`)" - echo "Copyright (C) 2007-2021 Ole Tange, http://ole.tange.dk and Free Software" + echo "Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " echo "This is free software: you are free to change and redistribute it." diff --git a/src/env_parallel.mksh b/src/env_parallel.mksh index c69e50b2..964beeae 100644 --- a/src/env_parallel.mksh +++ b/src/env_parallel.mksh @@ -7,7 +7,7 @@ # after which 'env_parallel' works # # -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later env_parallel() { @@ -366,7 +366,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then echo "parset 20211222 (GNU parallel `parallel --minversion 1`)" - echo "Copyright (C) 2007-2021 Ole Tange, http://ole.tange.dk and Free Software" + echo "Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " echo "This is free software: you are free to change and redistribute it." diff --git a/src/env_parallel.pdksh b/src/env_parallel.pdksh index 43b479fd..b530ccf4 100755 --- a/src/env_parallel.pdksh +++ b/src/env_parallel.pdksh @@ -7,7 +7,7 @@ # after which 'env_parallel' works # # -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later env_parallel() { diff --git a/src/env_parallel.pod b/src/env_parallel.pod index 57c7d54b..a1982587 100644 --- a/src/env_parallel.pod +++ b/src/env_parallel.pod @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GFDL-1.3-or-later # SPDX-License-Identifier: CC-BY-SA-4.0 @@ -807,7 +807,7 @@ Copyright (C) 2007-10-18 Ole Tange, http://ole.tange.dk Copyright (C) 2008-2010 Ole Tange, http://ole.tange.dk -Copyright (C) 2010-2021 Ole Tange, http://ole.tange.dk and Free +Copyright (C) 2010-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. diff --git a/src/env_parallel.sh b/src/env_parallel.sh index c1595211..7b14ca73 100755 --- a/src/env_parallel.sh +++ b/src/env_parallel.sh @@ -7,7 +7,7 @@ # after which 'env_parallel' works # # -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later # shellcheck disable=SC2006 @@ -391,7 +391,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then echo "parset 20211222 (GNU parallel `parallel --minversion 1`)" - echo "Copyright (C) 2007-2021 Ole Tange, http://ole.tange.dk and Free Software" + echo "Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " echo "This is free software: you are free to change and redistribute it." diff --git a/src/env_parallel.tcsh b/src/env_parallel.tcsh index 9e6b908d..8358ec1b 100755 --- a/src/env_parallel.tcsh +++ b/src/env_parallel.tcsh @@ -7,7 +7,7 @@ # after which 'env_parallel' works # # -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later set _parallel_exit_CODE=0 diff --git a/src/env_parallel.zsh b/src/env_parallel.zsh index 1a5bfa27..d078cf4e 100755 --- a/src/env_parallel.zsh +++ b/src/env_parallel.zsh @@ -7,7 +7,7 @@ # after which 'env_parallel' works # # -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later env_parallel() { @@ -356,7 +356,7 @@ _parset_main() { fi if [ "$_parset_NAME" = "--version" ] ; then echo "parset 20211222 (GNU parallel `parallel --minversion 1`)" - echo "Copyright (C) 2007-2021 Ole Tange, http://ole.tange.dk and Free Software" + echo "Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software" echo "Foundation, Inc." echo "License GPLv3+: GNU GPL version 3 or later " echo "This is free software: you are free to change and redistribute it." diff --git a/src/niceload b/src/niceload index a27b81c2..a656ef43 100755 --- a/src/niceload +++ b/src/niceload @@ -2,7 +2,7 @@ # Copyright (C) 2004-2010 Ole Tange, http://ole.tange.dk # -# Copyright (C) 2010-2021 Ole Tange, http://ole.tange.dk and +# Copyright (C) 2010-2022 Ole Tange, http://ole.tange.dk and # Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -20,7 +20,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later use strict; diff --git a/src/niceload.pod b/src/niceload.pod index 2849fee8..75656f32 100644 --- a/src/niceload.pod +++ b/src/niceload.pod @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GFDL-1.3-or-later # SPDX-License-Identifier: CC-BY-SA-4.0 @@ -309,7 +309,7 @@ Copyright (C) 2004-11-19 Ole Tange, http://ole.tange.dk Copyright (C) 2005-2010 Ole Tange, http://ole.tange.dk -Copyright (C) 2010-2021 Ole Tange, http://ole.tange.dk and Free +Copyright (C) 2010-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. =head1 LICENSE diff --git a/src/optional/python/gnuparallel/runwrapper-generator.pl b/src/optional/python/gnuparallel/runwrapper-generator.pl index 56dc0f5e..35c92744 100755 --- a/src/optional/python/gnuparallel/runwrapper-generator.pl +++ b/src/optional/python/gnuparallel/runwrapper-generator.pl @@ -17,7 +17,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later use strict; diff --git a/src/parallel b/src/parallel index 4c9c437b..b4c625a0 100755 --- a/src/parallel +++ b/src/parallel @@ -1,6 +1,6 @@ #!/usr/bin/env perl -# Copyright (C) 2007-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later # open3 used in Job::start @@ -196,14 +196,21 @@ sub pipe_tee_setup() { `echo | tee --output-error=warn-nopipe /dev/null >/dev/null 2>/dev/null`; my $opt = $? ? "" : "--output-error=warn-nopipe"; ::debug("init","tee $opt"); - # Let tee inherit our stdin - # and redirect stdout to null - open STDOUT, ">","/dev/null"; - if($opt) { - exec "tee", $opt, @fifos; + if($opt::dryrun) { + # This is not exactly what is run, but it gives the basic idea + print "mkfifo @fifos\n"; + print "tee $opt @fifos >/dev/null &\n"; } else { - exec "tee", @fifos; + # Let tee inherit our stdin + # and redirect stdout to null + open STDOUT, ">","/dev/null"; + if($opt) { + exec "tee", $opt, @fifos; + } else { + exec "tee", @fifos; + } } + exit(0); } # For each fifo # (rm fifo1; grep 1) < fifo1 @@ -2546,11 +2553,14 @@ sub parse_semaphore() { } if($Global::semaphore) { if(@opt::a) { - # A semaphore does not take input from neither stdin nor file - ::error("A semaphore does not take input from neither stdin nor a file\n"); - ::wait_and_exit(255); + # Assign the first -a to STDIN + open(STDIN,"<",shift @opt::a); + if(@opt::a) { + # We currently have no way of dealing with more -a + ::error("A semaphore cannot take input from more files\n"); + ::wait_and_exit(255); + } } - @opt::a = ("/dev/null"); # Append a dummy empty argument # \0 => nothing (not the empty string) push(@Global::unget_argv, [Arg->new("\0noarg")]); @@ -5208,7 +5218,7 @@ sub version() { print join ("\n", "GNU $Global::progname $Global::version", - "Copyright (C) 2007-2021 Ole Tange, http://ole.tange.dk and Free Software", + "Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software", "Foundation, Inc.", "License GPLv3+: GNU GPL version 3 or later ", "This is free software: you are free to change and redistribute it.", @@ -5343,7 +5353,7 @@ sub embed() { } print "#!$Global::shell -# Copyright (C) 2007-2021 $user, Ole Tange, http://ole.tange.dk +# Copyright (C) 2007-2022 $user, Ole Tange, http://ole.tange.dk # and Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -10073,8 +10083,8 @@ sub start($) { } $job->set_fh(0,"w",$stdin_fh); if($opt::tee or $opt::shard or $opt::bin) { $job->set_virgin(0); } - } elsif ($opt::tty and -c "/dev/tty" and - open(my $devtty_fh, "<", "/dev/tty")) { + } elsif($opt::tty and -c "/dev/tty" and + open(my $devtty_fh, "<", "/dev/tty")) { # Give /dev/tty to the command if no one else is using it # The eval is needed to catch exception from open3 local (*IN,*OUT,*ERR); @@ -10092,6 +10102,10 @@ sub start($) { }; close $devtty_fh; $job->set_virgin(0); + } elsif($opt::semaphore) { + # Allow sem to read from stdin + $pid = open3_setpgrp("<&STDIN",$stdout_fh,$stderr_fh,$command); + $job->set_virgin(0); } else { $pid = open3_setpgrp(::gensym(),$stdout_fh,$stderr_fh,$command); $job->set_virgin(0); diff --git a/src/parallel.pod b/src/parallel.pod index 21133ee3..38693098 100644 --- a/src/parallel.pod +++ b/src/parallel.pod @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GFDL-1.3-or-later # SPDX-License-Identifier: CC-BY-SA-4.0 @@ -5571,7 +5571,7 @@ Copyright (C) 2007-10-18 Ole Tange, http://ole.tange.dk Copyright (C) 2008-2010 Ole Tange, http://ole.tange.dk -Copyright (C) 2010-2021 Ole Tange, http://ole.tange.dk and Free +Copyright (C) 2010-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. Parts of the manual concerning B compatibility is inspired by diff --git a/src/parallel_alternatives.pod b/src/parallel_alternatives.pod index 93a3944c..dc9850fe 100644 --- a/src/parallel_alternatives.pod +++ b/src/parallel_alternatives.pod @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GFDL-1.3-or-later # SPDX-License-Identifier: CC-BY-SA-4.0 @@ -3625,7 +3625,7 @@ Copyright (C) 2007-10-18 Ole Tange, http://ole.tange.dk Copyright (C) 2008-2010 Ole Tange, http://ole.tange.dk -Copyright (C) 2010-2021 Ole Tange, http://ole.tange.dk and Free +Copyright (C) 2010-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. Parts of the manual concerning B compatibility is inspired by diff --git a/src/parallel_book.pod b/src/parallel_book.pod index 2edd57b1..5bbb4326 100644 --- a/src/parallel_book.pod +++ b/src/parallel_book.pod @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GFDL-1.3-or-later # SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/src/parallel_design.pod b/src/parallel_design.pod index 94be7f4f..899bea30 100644 --- a/src/parallel_design.pod +++ b/src/parallel_design.pod @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GFDL-1.3-or-later # SPDX-License-Identifier: CC-BY-SA-4.0 diff --git a/src/parallel_tutorial.pod b/src/parallel_tutorial.pod index 210084d5..51b5e1c4 100644 --- a/src/parallel_tutorial.pod +++ b/src/parallel_tutorial.pod @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GFDL-1.3-or-later # SPDX-License-Identifier: CC-BY-SA-4.0 @@ -3004,7 +3004,7 @@ When asking for help, always report the full output of this: Output: GNU parallel 20210122 - Copyright (C) 2007-2021 Ole Tange, http://ole.tange.dk and Free Software + Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later This is free software: you are free to change and redistribute it. @@ -3165,7 +3165,7 @@ https://my.fsf.org/donate/ =back -(C) 2013-2021 Ole Tange, GFDLv1.3+ (See +(C) 2013-2022 Ole Tange, GFDLv1.3+ (See LICENSES/GFDL-1.3-or-later.txt) diff --git a/src/parcat b/src/parcat index 13708ebe..285efce3 100755 --- a/src/parcat +++ b/src/parcat @@ -1,6 +1,6 @@ #!/usr/bin/perl -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later use Symbol qw(gensym); diff --git a/src/parcat.pod b/src/parcat.pod index 47b30738..2516e0bf 100644 --- a/src/parcat.pod +++ b/src/parcat.pod @@ -1,6 +1,6 @@ #!/usr/bin/perl -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GFDL-1.3-or-later # SPDX-License-Identifier: CC-BY-SA-4.0 @@ -71,7 +71,7 @@ GNU B is part of GNU B. Report bugs to =head1 AUTHOR -Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. =head1 LICENSE diff --git a/src/parset b/src/parset index 0ec4d72b..a475f47b 100755 --- a/src/parset +++ b/src/parset @@ -1,6 +1,6 @@ #!/usr/bin/env bash -# Copyright (C) 2016-2021 Ole Tange, http://ole.tange.dk and Free +# Copyright (C) 2016-2022 Ole Tange, http://ole.tange.dk and Free # Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -18,7 +18,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later grepq() { diff --git a/src/parset.pod b/src/parset.pod index ad9621e4..cb95ec6a 100644 --- a/src/parset.pod +++ b/src/parset.pod @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GFDL-1.3-or-later # SPDX-License-Identifier: CC-BY-SA-4.0 @@ -202,7 +202,7 @@ Copyright (C) 2007-10-18 Ole Tange, http://ole.tange.dk Copyright (C) 2008-2010 Ole Tange, http://ole.tange.dk -Copyright (C) 2010-2021 Ole Tange, http://ole.tange.dk and Free +Copyright (C) 2010-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. diff --git a/src/parsort b/src/parsort index 4f53a092..dfd22c7f 100755 --- a/src/parsort +++ b/src/parsort @@ -1,6 +1,6 @@ #!/usr/bin/perl -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later =pod @@ -45,7 +45,7 @@ On a 48 core machine you should see a speedup of 3x over B. =head1 AUTHOR -Copyright (C) 2020-2021 Ole Tange, +Copyright (C) 2020-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. @@ -233,7 +233,7 @@ sub version() { print join ("\n", "GNU $Global::progname $Global::version", - "Copyright (C) 2020-2021 Ole Tange, http://ole.tange.dk and Free Software", + "Copyright (C) 2020-2022 Ole Tange, http://ole.tange.dk and Free Software", "Foundation, Inc.", "License GPLv3+: GNU GPL version 3 or later ", "This is free software: you are free to change and redistribute it.", @@ -402,7 +402,7 @@ sub version() { print join ("\n", "GNU $Global::progname $Global::version", - "Copyright (C) 2007-2021 Ole Tange, http://ole.tange.dk and Free Software", + "Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software", "Foundation, Inc.", "License GPLv3+: GNU GPL version 3 or later ", "This is free software: you are free to change and redistribute it.", diff --git a/src/sem.pod b/src/sem.pod index 0e7bfb95..8aab66cc 100644 --- a/src/sem.pod +++ b/src/sem.pod @@ -1,6 +1,6 @@ #!/usr/bin/perl -w -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GFDL-1.3-or-later # SPDX-License-Identifier: CC-BY-SA-4.0 @@ -248,7 +248,7 @@ Report bugs to . =head1 AUTHOR -Copyright (C) 2010-2021 Ole Tange, http://ole.tange.dk and Free +Copyright (C) 2010-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. diff --git a/src/sphinx/Makefile b/src/sphinx/Makefile index ba59a477..78d0b491 100644 --- a/src/sphinx/Makefile +++ b/src/sphinx/Makefile @@ -1,6 +1,6 @@ # Minimal makefile for Sphinx documentation # -# SPDX-FileCopyrightText: 2002-2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2002-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/sphinx/source/conf.py b/src/sphinx/source/conf.py index f20ce49e..454e2774 100644 --- a/src/sphinx/source/conf.py +++ b/src/sphinx/source/conf.py @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/sphinx/source/sphinx.rst b/src/sphinx/source/sphinx.rst index 363fe396..98c1b90d 100644 --- a/src/sphinx/source/sphinx.rst +++ b/src/sphinx/source/sphinx.rst @@ -1,4 +1,4 @@ -.. SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +.. SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. .. .. SPDX-License-Identifier: GPL-3.0-or-later diff --git a/src/sql b/src/sql index 4837cd2b..f9a3f30f 100755 --- a/src/sql +++ b/src/sql @@ -2,7 +2,7 @@ # Copyright (C) 2008-2010 Ole Tange, http://ole.tange.dk # -# Copyright (C) 2010-2021 Ole Tange, http://ole.tange.dk and +# Copyright (C) 2010-2022 Ole Tange, http://ole.tange.dk and # Free Software Foundation, Inc. # # This program is free software; you can redistribute it and/or modify @@ -20,7 +20,7 @@ # or write to the Free Software Foundation, Inc., 51 Franklin St, # Fifth Floor, Boston, MA 02110-1301 USA # -# SPDX-FileCopyrightText: 2008-2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2008-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GFDL-1.3-or-later @@ -365,7 +365,7 @@ Databases Using DBURLs, ;login: The USENIX Magazine, April 2011:29-32. Copyright (C) 2008-2010 Ole Tange http://ole.tange.dk -Copyright (C) 2010-2021 Ole Tange, http://ole.tange.dk and Free +Copyright (C) 2010-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. =head1 LICENSE diff --git a/testsuite/Fixed.sh b/testsuite/Fixed.sh index a1eff6e5..07bacf71 100644 --- a/testsuite/Fixed.sh +++ b/testsuite/Fixed.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/Makefile b/testsuite/Makefile index 3a0a34a4..a224231d 100644 --- a/testsuite/Makefile +++ b/testsuite/Makefile @@ -1,4 +1,4 @@ -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/Portable.sh b/testsuite/Portable.sh index fe0bc308..0e910e8d 100644 --- a/testsuite/Portable.sh +++ b/testsuite/Portable.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/REQUIREMENTS b/testsuite/REQUIREMENTS index a57b07f0..7ff7e91f 100644 --- a/testsuite/REQUIREMENTS +++ b/testsuite/REQUIREMENTS @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2002-2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2002-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/Start.sh b/testsuite/Start.sh index 4d45bc29..9561cbe7 100755 --- a/testsuite/Start.sh +++ b/testsuite/Start.sh @@ -1,6 +1,6 @@ #!/bin/bash -x -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/niceload01.sh b/testsuite/tests-to-run/niceload01.sh index 03d2c851..e59d7afe 100755 --- a/testsuite/tests-to-run/niceload01.sh +++ b/testsuite/tests-to-run/niceload01.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/niceload02.sh b/testsuite/tests-to-run/niceload02.sh index 48096483..2a793ff6 100755 --- a/testsuite/tests-to-run/niceload02.sh +++ b/testsuite/tests-to-run/niceload02.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/niceload03.sh b/testsuite/tests-to-run/niceload03.sh index ff0a2401..76037495 100755 --- a/testsuite/tests-to-run/niceload03.sh +++ b/testsuite/tests-to-run/niceload03.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/niceload04.sh b/testsuite/tests-to-run/niceload04.sh index ac1f4c36..5c5b51c4 100755 --- a/testsuite/tests-to-run/niceload04.sh +++ b/testsuite/tests-to-run/niceload04.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-android.sh b/testsuite/tests-to-run/parallel-android.sh index a86084fa..43761d2e 100755 --- a/testsuite/tests-to-run/parallel-android.sh +++ b/testsuite/tests-to-run/parallel-android.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-centos3.sh b/testsuite/tests-to-run/parallel-centos3.sh index 9b3c6817..1c74743b 100644 --- a/testsuite/tests-to-run/parallel-centos3.sh +++ b/testsuite/tests-to-run/parallel-centos3.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-freebsd.sh b/testsuite/tests-to-run/parallel-freebsd.sh index 74f838d3..93510334 100644 --- a/testsuite/tests-to-run/parallel-freebsd.sh +++ b/testsuite/tests-to-run/parallel-freebsd.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-install.sh b/testsuite/tests-to-run/parallel-install.sh index 0e660f81..9f086b58 100644 --- a/testsuite/tests-to-run/parallel-install.sh +++ b/testsuite/tests-to-run/parallel-install.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-0.3s.sh b/testsuite/tests-to-run/parallel-local-0.3s.sh index ffa92073..7d3837eb 100644 --- a/testsuite/tests-to-run/parallel-local-0.3s.sh +++ b/testsuite/tests-to-run/parallel-local-0.3s.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-100s.sh b/testsuite/tests-to-run/parallel-local-100s.sh index 5686a17a..4cf187eb 100644 --- a/testsuite/tests-to-run/parallel-local-100s.sh +++ b/testsuite/tests-to-run/parallel-local-100s.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-10s.sh b/testsuite/tests-to-run/parallel-local-10s.sh index 12bdb6a0..f77583d7 100644 --- a/testsuite/tests-to-run/parallel-local-10s.sh +++ b/testsuite/tests-to-run/parallel-local-10s.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-1s.sh b/testsuite/tests-to-run/parallel-local-1s.sh index bb3d91e8..bdcd64c3 100644 --- a/testsuite/tests-to-run/parallel-local-1s.sh +++ b/testsuite/tests-to-run/parallel-local-1s.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-300s.sh b/testsuite/tests-to-run/parallel-local-300s.sh index 053d5bf9..5ffde30f 100644 --- a/testsuite/tests-to-run/parallel-local-300s.sh +++ b/testsuite/tests-to-run/parallel-local-300s.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-30s.sh b/testsuite/tests-to-run/parallel-local-30s.sh index cfe94082..ab34875d 100755 --- a/testsuite/tests-to-run/parallel-local-30s.sh +++ b/testsuite/tests-to-run/parallel-local-30s.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-3s.sh b/testsuite/tests-to-run/parallel-local-3s.sh index 5e4fc9aa..4c842968 100644 --- a/testsuite/tests-to-run/parallel-local-3s.sh +++ b/testsuite/tests-to-run/parallel-local-3s.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-load.sh b/testsuite/tests-to-run/parallel-local-load.sh index 50ce7139..cc8c99fb 100644 --- a/testsuite/tests-to-run/parallel-local-load.sh +++ b/testsuite/tests-to-run/parallel-local-load.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-mem.sh b/testsuite/tests-to-run/parallel-local-mem.sh index 505ea4ca..8be25e0f 100755 --- a/testsuite/tests-to-run/parallel-local-mem.sh +++ b/testsuite/tests-to-run/parallel-local-mem.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-parsort.sh b/testsuite/tests-to-run/parallel-local-parsort.sh index c19c423b..7a9f5d72 100755 --- a/testsuite/tests-to-run/parallel-local-parsort.sh +++ b/testsuite/tests-to-run/parallel-local-parsort.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-race01.sh b/testsuite/tests-to-run/parallel-local-race01.sh index 272bf1af..0bfc5077 100755 --- a/testsuite/tests-to-run/parallel-local-race01.sh +++ b/testsuite/tests-to-run/parallel-local-race01.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-race02.sh b/testsuite/tests-to-run/parallel-local-race02.sh index 04746bca..f016ef0b 100644 --- a/testsuite/tests-to-run/parallel-local-race02.sh +++ b/testsuite/tests-to-run/parallel-local-race02.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-sql.sh b/testsuite/tests-to-run/parallel-local-sql.sh index ec2d364d..8059e512 100755 --- a/testsuite/tests-to-run/parallel-local-sql.sh +++ b/testsuite/tests-to-run/parallel-local-sql.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-sql01.sh b/testsuite/tests-to-run/parallel-local-sql01.sh index 823fea8f..f497d65f 100644 --- a/testsuite/tests-to-run/parallel-local-sql01.sh +++ b/testsuite/tests-to-run/parallel-local-sql01.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-sql02.sh b/testsuite/tests-to-run/parallel-local-sql02.sh index 20482e4a..2f28e448 100644 --- a/testsuite/tests-to-run/parallel-local-sql02.sh +++ b/testsuite/tests-to-run/parallel-local-sql02.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-ssh1.sh b/testsuite/tests-to-run/parallel-local-ssh1.sh index 5f93c7c1..979b9b1d 100644 --- a/testsuite/tests-to-run/parallel-local-ssh1.sh +++ b/testsuite/tests-to-run/parallel-local-ssh1.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-ssh2.sh b/testsuite/tests-to-run/parallel-local-ssh2.sh index 1819311d..39503876 100644 --- a/testsuite/tests-to-run/parallel-local-ssh2.sh +++ b/testsuite/tests-to-run/parallel-local-ssh2.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-ssh3.sh b/testsuite/tests-to-run/parallel-local-ssh3.sh index e9cfaa98..dce0b676 100644 --- a/testsuite/tests-to-run/parallel-local-ssh3.sh +++ b/testsuite/tests-to-run/parallel-local-ssh3.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-ssh4.sh b/testsuite/tests-to-run/parallel-local-ssh4.sh index f6cbe523..ecf29e17 100644 --- a/testsuite/tests-to-run/parallel-local-ssh4.sh +++ b/testsuite/tests-to-run/parallel-local-ssh4.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-ssh5.sh b/testsuite/tests-to-run/parallel-local-ssh5.sh index c9158162..702318fb 100644 --- a/testsuite/tests-to-run/parallel-local-ssh5.sh +++ b/testsuite/tests-to-run/parallel-local-ssh5.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-ssh6.sh b/testsuite/tests-to-run/parallel-local-ssh6.sh index 72cd5e4c..afb44d08 100644 --- a/testsuite/tests-to-run/parallel-local-ssh6.sh +++ b/testsuite/tests-to-run/parallel-local-ssh6.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-ssh7.sh b/testsuite/tests-to-run/parallel-local-ssh7.sh index 85fab609..2c6641d9 100755 --- a/testsuite/tests-to-run/parallel-local-ssh7.sh +++ b/testsuite/tests-to-run/parallel-local-ssh7.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-ssh8.sh b/testsuite/tests-to-run/parallel-local-ssh8.sh index e54c4f51..32418155 100644 --- a/testsuite/tests-to-run/parallel-local-ssh8.sh +++ b/testsuite/tests-to-run/parallel-local-ssh8.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-ssh9.sh b/testsuite/tests-to-run/parallel-local-ssh9.sh index d66533a2..39fe84ab 100644 --- a/testsuite/tests-to-run/parallel-local-ssh9.sh +++ b/testsuite/tests-to-run/parallel-local-ssh9.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local-utf8.sh b/testsuite/tests-to-run/parallel-local-utf8.sh index 84e401f3..868551be 100755 --- a/testsuite/tests-to-run/parallel-local-utf8.sh +++ b/testsuite/tests-to-run/parallel-local-utf8.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local1.sh b/testsuite/tests-to-run/parallel-local1.sh index 432d4538..115c18fd 100644 --- a/testsuite/tests-to-run/parallel-local1.sh +++ b/testsuite/tests-to-run/parallel-local1.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local10.sh b/testsuite/tests-to-run/parallel-local10.sh index 877ec604..40a31c62 100755 --- a/testsuite/tests-to-run/parallel-local10.sh +++ b/testsuite/tests-to-run/parallel-local10.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local104.sh b/testsuite/tests-to-run/parallel-local104.sh index b1d8d400..ddc15f6e 100755 --- a/testsuite/tests-to-run/parallel-local104.sh +++ b/testsuite/tests-to-run/parallel-local104.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local105.sh b/testsuite/tests-to-run/parallel-local105.sh index 4dadeeb6..d8e2ee7b 100755 --- a/testsuite/tests-to-run/parallel-local105.sh +++ b/testsuite/tests-to-run/parallel-local105.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local108.sh b/testsuite/tests-to-run/parallel-local108.sh index 714c8af4..38a6af6a 100755 --- a/testsuite/tests-to-run/parallel-local108.sh +++ b/testsuite/tests-to-run/parallel-local108.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/testsuite/tests-to-run/parallel-local114.sh b/testsuite/tests-to-run/parallel-local114.sh index 39e818c1..ffdee3b8 100755 --- a/testsuite/tests-to-run/parallel-local114.sh +++ b/testsuite/tests-to-run/parallel-local114.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local12.sh b/testsuite/tests-to-run/parallel-local12.sh index 75fb210e..d41359e9 100644 --- a/testsuite/tests-to-run/parallel-local12.sh +++ b/testsuite/tests-to-run/parallel-local12.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local129.sh b/testsuite/tests-to-run/parallel-local129.sh index 714c8af4..38a6af6a 100644 --- a/testsuite/tests-to-run/parallel-local129.sh +++ b/testsuite/tests-to-run/parallel-local129.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/testsuite/tests-to-run/parallel-local13.sh b/testsuite/tests-to-run/parallel-local13.sh index 9badb57d..fee83323 100644 --- a/testsuite/tests-to-run/parallel-local13.sh +++ b/testsuite/tests-to-run/parallel-local13.sh @@ -1,6 +1,6 @@ #!/bin/bash -x -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local14.sh b/testsuite/tests-to-run/parallel-local14.sh index d2026420..743be4bf 100644 --- a/testsuite/tests-to-run/parallel-local14.sh +++ b/testsuite/tests-to-run/parallel-local14.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local140.sh b/testsuite/tests-to-run/parallel-local140.sh index 714c8af4..38a6af6a 100644 --- a/testsuite/tests-to-run/parallel-local140.sh +++ b/testsuite/tests-to-run/parallel-local140.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/testsuite/tests-to-run/parallel-local15.sh b/testsuite/tests-to-run/parallel-local15.sh index d551d8fa..35b40cdb 100755 --- a/testsuite/tests-to-run/parallel-local15.sh +++ b/testsuite/tests-to-run/parallel-local15.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local150.sh b/testsuite/tests-to-run/parallel-local150.sh index 9b63b162..b4c6dcfc 100644 --- a/testsuite/tests-to-run/parallel-local150.sh +++ b/testsuite/tests-to-run/parallel-local150.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local152.sh b/testsuite/tests-to-run/parallel-local152.sh index 52002697..ffcc80e3 100644 --- a/testsuite/tests-to-run/parallel-local152.sh +++ b/testsuite/tests-to-run/parallel-local152.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local154.sh b/testsuite/tests-to-run/parallel-local154.sh index 714c8af4..38a6af6a 100644 --- a/testsuite/tests-to-run/parallel-local154.sh +++ b/testsuite/tests-to-run/parallel-local154.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/testsuite/tests-to-run/parallel-local157.sh b/testsuite/tests-to-run/parallel-local157.sh index 714c8af4..38a6af6a 100644 --- a/testsuite/tests-to-run/parallel-local157.sh +++ b/testsuite/tests-to-run/parallel-local157.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/testsuite/tests-to-run/parallel-local18.sh b/testsuite/tests-to-run/parallel-local18.sh index 264cc294..239f9237 100644 --- a/testsuite/tests-to-run/parallel-local18.sh +++ b/testsuite/tests-to-run/parallel-local18.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local19.sh b/testsuite/tests-to-run/parallel-local19.sh index 714c8af4..38a6af6a 100755 --- a/testsuite/tests-to-run/parallel-local19.sh +++ b/testsuite/tests-to-run/parallel-local19.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/testsuite/tests-to-run/parallel-local2.sh b/testsuite/tests-to-run/parallel-local2.sh index 0385908d..1098e812 100644 --- a/testsuite/tests-to-run/parallel-local2.sh +++ b/testsuite/tests-to-run/parallel-local2.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local20.sh b/testsuite/tests-to-run/parallel-local20.sh index c86b142e..0f8d8ba8 100644 --- a/testsuite/tests-to-run/parallel-local20.sh +++ b/testsuite/tests-to-run/parallel-local20.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local21.sh b/testsuite/tests-to-run/parallel-local21.sh index c9a5edf4..f1773840 100644 --- a/testsuite/tests-to-run/parallel-local21.sh +++ b/testsuite/tests-to-run/parallel-local21.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local22.sh b/testsuite/tests-to-run/parallel-local22.sh index 35b3ccc9..cd0cd8fd 100755 --- a/testsuite/tests-to-run/parallel-local22.sh +++ b/testsuite/tests-to-run/parallel-local22.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local23.sh b/testsuite/tests-to-run/parallel-local23.sh index 6c9456d0..762dd757 100755 --- a/testsuite/tests-to-run/parallel-local23.sh +++ b/testsuite/tests-to-run/parallel-local23.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local4.sh b/testsuite/tests-to-run/parallel-local4.sh index 2be663d8..a17cebd9 100644 --- a/testsuite/tests-to-run/parallel-local4.sh +++ b/testsuite/tests-to-run/parallel-local4.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local5.sh b/testsuite/tests-to-run/parallel-local5.sh index e4faf5af..db021508 100644 --- a/testsuite/tests-to-run/parallel-local5.sh +++ b/testsuite/tests-to-run/parallel-local5.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local6.sh b/testsuite/tests-to-run/parallel-local6.sh index 714c8af4..38a6af6a 100755 --- a/testsuite/tests-to-run/parallel-local6.sh +++ b/testsuite/tests-to-run/parallel-local6.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/testsuite/tests-to-run/parallel-local7.sh b/testsuite/tests-to-run/parallel-local7.sh index 4fd73de3..090c3306 100755 --- a/testsuite/tests-to-run/parallel-local7.sh +++ b/testsuite/tests-to-run/parallel-local7.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local8.sh b/testsuite/tests-to-run/parallel-local8.sh index c80a80e0..5fe1a9da 100644 --- a/testsuite/tests-to-run/parallel-local8.sh +++ b/testsuite/tests-to-run/parallel-local8.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-local9.sh b/testsuite/tests-to-run/parallel-local9.sh index 82b0a5c2..740a8d65 100644 --- a/testsuite/tests-to-run/parallel-local9.sh +++ b/testsuite/tests-to-run/parallel-local9.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-localhost1.sh b/testsuite/tests-to-run/parallel-localhost1.sh index b7b11da2..a35d1f58 100644 --- a/testsuite/tests-to-run/parallel-localhost1.sh +++ b/testsuite/tests-to-run/parallel-localhost1.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-macos.sh b/testsuite/tests-to-run/parallel-macos.sh index 694c8c7c..289f07fc 100644 --- a/testsuite/tests-to-run/parallel-macos.sh +++ b/testsuite/tests-to-run/parallel-macos.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-polarhome.sh b/testsuite/tests-to-run/parallel-polarhome.sh index 4140cc3c..6fc0342e 100644 --- a/testsuite/tests-to-run/parallel-polarhome.sh +++ b/testsuite/tests-to-run/parallel-polarhome.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-remote1.sh b/testsuite/tests-to-run/parallel-remote1.sh index 8093526c..ce20acf3 100644 --- a/testsuite/tests-to-run/parallel-remote1.sh +++ b/testsuite/tests-to-run/parallel-remote1.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-tutorial.sh b/testsuite/tests-to-run/parallel-tutorial.sh index 32706f33..53364fa5 100644 --- a/testsuite/tests-to-run/parallel-tutorial.sh +++ b/testsuite/tests-to-run/parallel-tutorial.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parallel-virtualbox1.sh b/testsuite/tests-to-run/parallel-virtualbox1.sh index fde3df3d..01c4ef3f 100644 --- a/testsuite/tests-to-run/parallel-virtualbox1.sh +++ b/testsuite/tests-to-run/parallel-virtualbox1.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/parsort-local-01.sh b/testsuite/tests-to-run/parsort-local-01.sh index 0c86c74d..eb5c810c 100644 --- a/testsuite/tests-to-run/parsort-local-01.sh +++ b/testsuite/tests-to-run/parsort-local-01.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/sem01.sh b/testsuite/tests-to-run/sem01.sh index 68989fa4..48e84b91 100755 --- a/testsuite/tests-to-run/sem01.sh +++ b/testsuite/tests-to-run/sem01.sh @@ -1,44 +1,69 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later -# -L1 will join lines ending in ' ' -cat <<'EOF' | sed -e 's/;$/; /;s/$SERVER1/'$SERVER1'/;s/$SERVER2/'$SERVER2'/' | stdout parallel -vj0 -k --joblog /tmp/jl-`basename $0` -L1 -r -echo '### Test mutex. This should not mix output'; - parallel --semaphore --id mutex -u seq 1 10 '|' pv -qL 20; - parallel --semaphore --id mutex -u seq 11 20 '|' pv -qL 100; - parallel --semaphore --id mutex --wait; - echo done +par_stdin() { + echo '### bug #60579: Sem: Allow reading from stdin and setting -a' + seq 10 | parallel --semaphore --id stdin wc + seq 10 | parallel --semaphore --id stdin --fg wc + tmp=$(mktemp) + seq 10 > $tmp + parallel -a $tmp --semaphore --id stdin wc + parallel -a $tmp --semaphore --id stdin --fg wc + parallel --semaphore --id stdin --wait + # Should fail: More files are not supported + parallel -a $tmp -a $tmp --semaphore --id stdin --fg wc +} -echo '### Test similar example as from man page - run 2 jobs simultaneously' -echo 'Expect done: 1 2 5 3 4' -for i in 5 1 2 3 4 ; do - sleep 0.2; - echo Scheduling $i; - sem -j2 --id ex2jobs -u echo starting $i ";" sleep $i ";" echo done $i; -done; -sem --id ex2jobs --wait +par_mutex() { + echo '### Test mutex. This should not mix output' + parallel --semaphore --id mutex -u seq 1 10 '|' pv -qL 20 + parallel --semaphore --id mutex -u seq 11 20 '|' pv -qL 100 + parallel --semaphore --id mutex --wait + echo done +} -echo '### Test --fg followed by --bg' - parallel -u --id fgbg --fg --semaphore seq 1 10 '|' pv -qL 30; - parallel -u --id fgbg --bg --semaphore seq 11 20 '|' pv -qL 30; - parallel -u --id fgbg --fg --semaphore seq 21 30 '|' pv -qL 30; - parallel -u --id fgbg --bg --semaphore seq 31 40 '|' pv -qL 30; - sem --id fgbg --wait +par_2jobs() { + echo '### Test similar example as from man page - run 2 jobs simultaneously' + echo 'Expect done: 1 2 5 3 4' + for i in 5 1 2 3 4 ; do + sleep 0.2 + echo Scheduling $i + sem -j2 --id ex2jobs -u echo starting $i ";" sleep $i ";" echo done $i + done + sem --id ex2jobs --wait +} -echo '### Test bug #33621: --bg -p should give an error message' - stdout parallel -p --bg echo x{} +par_fg_then_bg() { + echo '### Test --fg followed by --bg' + parallel -u --id fgbg --fg --semaphore seq 1 10 '|' pv -qL 30 + parallel -u --id fgbg --bg --semaphore seq 11 20 '|' pv -qL 30 + parallel -u --id fgbg --fg --semaphore seq 21 30 '|' pv -qL 30 + parallel -u --id fgbg --bg --semaphore seq 31 40 '|' pv -qL 30 + sem --id fgbg --wait +} -echo '### Failed on 20141226' - sem --fg --line-buffer --id bugin20141226 echo OK +par_bg_p_should_error() { + echo '### Test bug #33621: --bg -p should give an error message' + stdout parallel -p --bg echo x{} +} -echo '### Test --st +1/-1' - stdout sem --id st --line-buffer "echo A normal-start;sleep 3;echo C normal-end"; - stdout sem --id st --line-buffer --st 1 "echo B st1-start;sleep 3;echo D st1-end"; - stdout sem --id st --line-buffer --st -1 "echo ERROR-st-1-start;sleep 3;echo ERROR-st-1-end"; - stdout sem --id st --wait +par_fg_line-buffer() { + echo '### Failed on 20141226' + sem --fg --line-buffer --id bugin20141226 echo OK +} +par_semaphore-timeout() { + echo '### Test --st +1/-1' + stdout sem --id st --line-buffer "echo A normal-start;sleep 3;echo C normal-end" + stdout sem --id st --line-buffer --st 1 "echo B st1-start;sleep 3;echo D st1-end" + stdout sem --id st --line-buffer --st -1 "echo ERROR-st-1-start;sleep 3;echo ERROR-st-1-end" + stdout sem --id st --wait +} -EOF +export -f $(compgen -A function | grep par_) +compgen -A function | grep par_ | LC_ALL=C sort | + parallel --timeout 3000% -j6 --tag -k --joblog /tmp/jl-`basename $0` '{} 2>&1' | + perl -pe 's:/usr/bin:/bin:g' diff --git a/testsuite/tests-to-run/sem02.sh b/testsuite/tests-to-run/sem02.sh index d7ccb8ae..69138ae1 100644 --- a/testsuite/tests-to-run/sem02.sh +++ b/testsuite/tests-to-run/sem02.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/sql01.sh b/testsuite/tests-to-run/sql01.sh index b4ea49a4..709e7fdf 100755 --- a/testsuite/tests-to-run/sql01.sh +++ b/testsuite/tests-to-run/sql01.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/sql02.sh b/testsuite/tests-to-run/sql02.sh index 5610cf19..1fdd40b3 100644 --- a/testsuite/tests-to-run/sql02.sh +++ b/testsuite/tests-to-run/sql02.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/sql03.sh b/testsuite/tests-to-run/sql03.sh index 533ba8b2..577e9e73 100644 --- a/testsuite/tests-to-run/sql03.sh +++ b/testsuite/tests-to-run/sql03.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test13.sh b/testsuite/tests-to-run/test13.sh index a9bca8fb..1470931d 100755 --- a/testsuite/tests-to-run/test13.sh +++ b/testsuite/tests-to-run/test13.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test17.sh b/testsuite/tests-to-run/test17.sh index 44fc9088..9b68fed1 100755 --- a/testsuite/tests-to-run/test17.sh +++ b/testsuite/tests-to-run/test17.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test18.sh b/testsuite/tests-to-run/test18.sh index c1bdc8e7..01318189 100644 --- a/testsuite/tests-to-run/test18.sh +++ b/testsuite/tests-to-run/test18.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test19.sh b/testsuite/tests-to-run/test19.sh index fc96a04e..4b37cfdf 100644 --- a/testsuite/tests-to-run/test19.sh +++ b/testsuite/tests-to-run/test19.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test21.sh b/testsuite/tests-to-run/test21.sh index 888ad1ff..6b76c3b6 100644 --- a/testsuite/tests-to-run/test21.sh +++ b/testsuite/tests-to-run/test21.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test23.sh b/testsuite/tests-to-run/test23.sh index 3513cc6b..3f633d31 100644 --- a/testsuite/tests-to-run/test23.sh +++ b/testsuite/tests-to-run/test23.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test30.sh b/testsuite/tests-to-run/test30.sh index 3db7f633..0af3419e 100644 --- a/testsuite/tests-to-run/test30.sh +++ b/testsuite/tests-to-run/test30.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test32.sh b/testsuite/tests-to-run/test32.sh index 714c8af4..38a6af6a 100644 --- a/testsuite/tests-to-run/test32.sh +++ b/testsuite/tests-to-run/test32.sh @@ -1,5 +1,5 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later \ No newline at end of file diff --git a/testsuite/tests-to-run/test35.sh b/testsuite/tests-to-run/test35.sh index 9f12ff84..ebeb6be6 100755 --- a/testsuite/tests-to-run/test35.sh +++ b/testsuite/tests-to-run/test35.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test36.sh b/testsuite/tests-to-run/test36.sh index 39baacea..e8de1559 100644 --- a/testsuite/tests-to-run/test36.sh +++ b/testsuite/tests-to-run/test36.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test37.sh b/testsuite/tests-to-run/test37.sh index 037ec743..cf0bde6e 100644 --- a/testsuite/tests-to-run/test37.sh +++ b/testsuite/tests-to-run/test37.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test41.sh b/testsuite/tests-to-run/test41.sh index 7d16d1f2..4aaa6bb4 100644 --- a/testsuite/tests-to-run/test41.sh +++ b/testsuite/tests-to-run/test41.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test45.sh b/testsuite/tests-to-run/test45.sh index efdc1d71..be60d2c2 100644 --- a/testsuite/tests-to-run/test45.sh +++ b/testsuite/tests-to-run/test45.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test46.sh b/testsuite/tests-to-run/test46.sh index aea45fad..4d78bf54 100644 --- a/testsuite/tests-to-run/test46.sh +++ b/testsuite/tests-to-run/test46.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test47.sh b/testsuite/tests-to-run/test47.sh index 73b7eab8..18fed880 100644 --- a/testsuite/tests-to-run/test47.sh +++ b/testsuite/tests-to-run/test47.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test60.sh b/testsuite/tests-to-run/test60.sh index 42592218..2058401b 100644 --- a/testsuite/tests-to-run/test60.sh +++ b/testsuite/tests-to-run/test60.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/tests-to-run/test61.sh b/testsuite/tests-to-run/test61.sh index 436b9073..fb34ac9a 100644 --- a/testsuite/tests-to-run/test61.sh +++ b/testsuite/tests-to-run/test61.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/vagrant/Vagrantfile.tmpl b/testsuite/vagrant/Vagrantfile.tmpl index efd1bc25..2b10ec66 100644 --- a/testsuite/vagrant/Vagrantfile.tmpl +++ b/testsuite/vagrant/Vagrantfile.tmpl @@ -1,6 +1,6 @@ # -*- mode: ruby -*- # vi: set ft=ruby : -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # SPDX-License-Identifier: GPL-3.0-or-later # All Vagrant configuration is done below. The "2" in Vagrant.configure diff --git a/testsuite/vagrant/setup.sh b/testsuite/vagrant/setup.sh index 89f1bc14..ee4d86ce 100644 --- a/testsuite/vagrant/setup.sh +++ b/testsuite/vagrant/setup.sh @@ -1,6 +1,6 @@ #!/bin/bash -# SPDX-FileCopyrightText: 2021 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. +# SPDX-FileCopyrightText: 2021-2022 Ole Tange, http://ole.tange.dk and Free Software and Foundation, Inc. # # SPDX-License-Identifier: GPL-3.0-or-later diff --git a/testsuite/wanted-results/parallel-tutorial b/testsuite/wanted-results/parallel-tutorial index 1ddb45b1..28edc6ef 100644 --- a/testsuite/wanted-results/parallel-tutorial +++ b/testsuite/wanted-results/parallel-tutorial @@ -1239,7 +1239,7 @@ This helps funding further development; AND IT WON'T COST YOU A CENT. If you pay 10000 EUR you should feel free to use GNU Parallel without citing. parallel --version GNU parallel VERSION -Copyright (C) 2007-2021 Ole Tange, http://ole.tange.dk and Free Software +Copyright (C) 2007-2022 Ole Tange, http://ole.tange.dk and Free Software Foundation, Inc. License GPLv3+: GNU GPL version 3 or later This is free software: you are free to change and redistribute it. diff --git a/testsuite/wanted-results/sem01 b/testsuite/wanted-results/sem01 index c409c23c..b490db3b 100644 --- a/testsuite/wanted-results/sem01 +++ b/testsuite/wanted-results/sem01 @@ -1,103 +1,98 @@ -echo '### Test mutex. This should not mix output'; parallel --semaphore --id mutex -u seq 1 10 '|' pv -qL 20; parallel --semaphore --id mutex -u seq 11 20 '|' pv -qL 100; parallel --semaphore --id mutex --wait; echo done -### Test mutex. This should not mix output -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -14 -15 -16 -17 -18 -19 -20 -done -echo '### Test similar example as from man page - run 2 jobs simultaneously' -### Test similar example as from man page - run 2 jobs simultaneously -echo 'Expect done: 1 2 5 3 4' -Expect done: 1 2 5 3 4 -for i in 5 1 2 3 4 ; do sleep 0.2; echo Scheduling $i; sem -j2 --id ex2jobs -u echo starting $i ";" sleep $i ";" echo done $i; done; sem --id ex2jobs --wait -Scheduling 5 -starting 5 -Scheduling 1 -starting 1 -Scheduling 2 -done 1 -starting 2 -Scheduling 3 -done 2 -starting 3 -Scheduling 4 -done 5 -starting 4 -done 3 -done 4 -echo '### Test --fg followed by --bg' -### Test --fg followed by --bg - parallel -u --id fgbg --fg --semaphore seq 1 10 '|' pv -qL 30; parallel -u --id fgbg --bg --semaphore seq 11 20 '|' pv -qL 30; parallel -u --id fgbg --fg --semaphore seq 21 30 '|' pv -qL 30; parallel -u --id fgbg --bg --semaphore seq 31 40 '|' pv -qL 30; sem --id fgbg --wait -1 -2 -3 -4 -5 -6 -7 -8 -9 -10 -11 -12 -13 -14 -15 -16 -17 -18 -19 -20 -21 -22 -23 -24 -25 -26 -27 -28 -29 -30 -31 -32 -33 -34 -35 -36 -37 -38 -39 -40 -echo '### Test bug #33621: --bg -p should give an error message' -### Test bug #33621: --bg -p should give an error message - stdout parallel -p --bg echo x{} -parallel: Error: Jobs running in the background cannot be interactive. -echo '### Failed on 20141226' -### Failed on 20141226 - sem --fg --line-buffer --id bugin20141226 echo OK -OK -echo '### Test --st +1/-1' -### Test --st +1/-1 - stdout sem --id st --line-buffer "echo A normal-start;sleep 3;echo C normal-end"; stdout sem --id st --line-buffer --st 1 "echo B st1-start;sleep 3;echo D st1-end"; stdout sem --id st --line-buffer --st -1 "echo ERROR-st-1-start;sleep 3;echo ERROR-st-1-end"; stdout sem --id st --wait -A normal-start -parallel: Warning: Semaphore timed out. Stealing the semaphore. -B st1-start -C normal-end -parallel: Warning: Semaphore timed out. Exiting. -D st1-end +par_2jobs ### Test similar example as from man page - run 2 jobs simultaneously +par_2jobs Expect done: 1 2 5 3 4 +par_2jobs Scheduling 5 +par_2jobs starting 5 +par_2jobs Scheduling 1 +par_2jobs starting 1 +par_2jobs Scheduling 2 +par_2jobs done 1 +par_2jobs starting 2 +par_2jobs Scheduling 3 +par_2jobs done 2 +par_2jobs starting 3 +par_2jobs Scheduling 4 +par_2jobs done 5 +par_2jobs starting 4 +par_2jobs done 3 +par_2jobs done 4 +par_bg_p_should_error ### Test bug #33621: --bg -p should give an error message +par_bg_p_should_error parallel: Error: Jobs running in the background cannot be interactive. +par_fg_line-buffer ### Failed on 20141226 +par_fg_line-buffer OK +par_fg_then_bg ### Test --fg followed by --bg +par_fg_then_bg 1 +par_fg_then_bg 2 +par_fg_then_bg 3 +par_fg_then_bg 4 +par_fg_then_bg 5 +par_fg_then_bg 6 +par_fg_then_bg 7 +par_fg_then_bg 8 +par_fg_then_bg 9 +par_fg_then_bg 10 +par_fg_then_bg 11 +par_fg_then_bg 12 +par_fg_then_bg 13 +par_fg_then_bg 14 +par_fg_then_bg 15 +par_fg_then_bg 16 +par_fg_then_bg 17 +par_fg_then_bg 18 +par_fg_then_bg 19 +par_fg_then_bg 20 +par_fg_then_bg 21 +par_fg_then_bg 22 +par_fg_then_bg 23 +par_fg_then_bg 24 +par_fg_then_bg 25 +par_fg_then_bg 26 +par_fg_then_bg 27 +par_fg_then_bg 28 +par_fg_then_bg 29 +par_fg_then_bg 30 +par_fg_then_bg 31 +par_fg_then_bg 32 +par_fg_then_bg 33 +par_fg_then_bg 34 +par_fg_then_bg 35 +par_fg_then_bg 36 +par_fg_then_bg 37 +par_fg_then_bg 38 +par_fg_then_bg 39 +par_fg_then_bg 40 +par_mutex ### Test mutex. This should not mix output +par_mutex 1 +par_mutex 2 +par_mutex 3 +par_mutex 4 +par_mutex 5 +par_mutex 6 +par_mutex 7 +par_mutex 8 +par_mutex 9 +par_mutex 10 +par_mutex 11 +par_mutex 12 +par_mutex 13 +par_mutex 14 +par_mutex 15 +par_mutex 16 +par_mutex 17 +par_mutex 18 +par_mutex 19 +par_mutex 20 +par_mutex done +par_semaphore-timeout ### Test --st +1/-1 +par_semaphore-timeout A normal-start +par_semaphore-timeout parallel: Warning: Semaphore timed out. Stealing the semaphore. +par_semaphore-timeout B st1-start +par_semaphore-timeout C normal-end +par_semaphore-timeout parallel: Warning: Semaphore timed out. Exiting. +par_semaphore-timeout D st1-end +par_stdin ### bug #60579: Sem: Allow reading from stdin and setting -a +par_stdin 10 10 21 +par_stdin 10 10 21 +par_stdin 10 10 21 +par_stdin 10 10 21 +par_stdin parallel: Error: A semaphore cannot take input from more files +par_stdin