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

Renamed dirs to Microsoft Windows compatible names.

Browse source
This commit is contained in:
Ole Tange 2022-05-23 21:31:44 +02:00
parent 2fc5f66688
commit d2753adec5
35 changed files with 29 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
packager/obs/Makefile
View file

@ -1,26 +1,26 @@
all: all:
perl -e 'exit $$ENV{YYYYMMDD} !~ /20/' perl -e 'exit $$ENV{YYYYMMDD} !~ /20/'
cd ../debian/ && make cd ../debian/ && make
osc rm home\:tange/parallel/parallel_*.dsc || true osc rm home-tange/parallel/parallel_*.dsc || true
cp ../debian/parallel_*.dsc ../debian/parallel_*.tar.gz home\:tange/parallel/ cp ../debian/parallel_*.dsc ../debian/parallel_*.tar.gz home-tange/parallel/
cp `ls ../../parallel-2*.tar.bz2|grep -v latest|tail -n1` home\:tange/parallel/ cp `ls ../../parallel-2*.tar.bz2|grep -v latest|tail -n1` home-tange/parallel/
perl -i -pe '/Version:/ and s/20\d\d\d\d\d\d/$$ENV{YYYYMMDD}/g' home:tange/parallel/parallel.spec perl -i -pe '/Version:/ and s/20\d\d\d\d\d\d/$$ENV{YYYYMMDD}/g' home-tange/parallel/parallel.spec
# Update sha256sum # Update sha256sum
cd home:tange/parallel && s=`sha256sum parallel-*.tar.bz2|field 1` perl -i -pe 's/(sha256sums=..)\w+(..)/$$1$$ENV{s}$$2/' PKGBUILD cd home-tange/parallel && s=`sha256sum parallel-*.tar.bz2|field 1` perl -i -pe 's/(sha256sums=..)\w+(..)/$$1$$ENV{s}$$2/' PKGBUILD
# Update version # Update version
cd home:tange/parallel && perl -i -pe 's/pkgver=.*/pkgver=$$ENV{YYYYMMDD}/' PKGBUILD cd home-tange/parallel && perl -i -pe 's/pkgver=.*/pkgver=$$ENV{YYYYMMDD}/' PKGBUILD
cd home\:tange/parallel/ && osc diff cd home-tange/parallel/ && osc diff
cd home\:tange/parallel/ && osc up cd home-tange/parallel/ && osc up
cd home\:tange/parallel/ && parallel osc add ::: *.spec *.dsc *.tar.gz *.tar.bz2 && echo Src added OK || true cd home-tange/parallel/ && parallel osc add ::: *.spec *.dsc *.tar.gz *.tar.bz2 && echo Src added OK || true
cd home\:tange/parallel/ && osc ci -m "New release" cd home-tange/parallel/ && osc ci -m "New release"
### Wait for "building" state to complete ### Wait for "building" state to complete
echo '### Wait for "building" state' echo '### Wait for "building" state'
cd home\:tange/parallel/ && yes building | parallel -vj1 --delay 10 --halt now,success=1 'osc results|G -E {}' cd home-tange/parallel/ && yes building | parallel -vj1 --delay 10 --halt now,success=1 'osc results|G -E {}'
echo '### Wait for "building" state to end' echo '### Wait for "building" state to end'
echo '### Ignore RedHat_RHEL-6 and Univention_3.2 that are broken' echo '### Ignore RedHat_RHEL-6 and Univention_3.2 that are broken'
cd home\:tange/parallel/ && yes building | parallel -vj1 --delay 10 --halt now,fail=1 'osc results|G -v RedHat_RHEL-6 -v Univention_3.2 -E {}' || true cd home-tange/parallel/ && yes building | parallel -vj1 --delay 10 --halt now,fail=1 'osc results|G -v RedHat_RHEL-6 -v Univention_3.2 -E {}' || true
echo '### Wait for "finished" state of .deb' echo '### Wait for "finished" state of .deb'
cd home\:tange/parallel/ && echo succeeded | parallel -vj1 --retries 30 --delay 10 --halt now,success=1 'osc results|G -E "(Debian|Ubuntu).*{}"' cd home-tange/parallel/ && echo succeeded | parallel -vj1 --retries 30 --delay 10 --halt now,success=1 'osc results|G -E "(Debian|Ubuntu).*{}"'
echo '### Wait for "finished" state of .rpm' echo '### Wait for "finished" state of .rpm'
cd home\:tange/parallel/ && echo succeeded | parallel -vj1 --retries 30 --delay 10 --halt now,success=1 'osc results|G -E "(SUSE|SLE|Scientific|RHEL|Fedora|CentOS).*{}"' cd home-tange/parallel/ && echo succeeded | parallel -vj1 --retries 30 --delay 10 --halt now,success=1 'osc results|G -E "(SUSE|SLE|Scientific|RHEL|Fedora|CentOS).*{}"'

0
packager/obs/home:tange/.osc/_apiurl → packager/obs/home-tange/.osc/_apiurl
View file

0
packager/obs/home:tange/.osc/_packages → packager/obs/home-tange/.osc/_packages
View file

0
packager/obs/home:tange/.osc/_project → packager/obs/home-tange/.osc/_project
View file

0
packager/obs/home:tange/parallel/.osc/_apiurl → packager/obs/home-tange/parallel/.osc/_apiurl
View file

8
packager/obs/home-tange/parallel/.osc/_files Normal file
View file

@ -0,0 +1,8 @@
<directory name="parallel" rev="326" vrev="2" srcmd5="2ff455f868b451b0acf2559d65b7616c">
<entry name="PKGBUILD" md5="e4fef9aeac03dd91b231bd23876dbdaf" size="936" mtime="1653333334" />
<entry name="parallel-20220522.tar.bz2" md5="ce4e3055e5bc318bd4df1fcd74e399bc" size="2372683" mtime="1653333335" />
<entry name="parallel.spec" md5="dfa4b6691d57f32d68d5fe022d0e1801" size="5713" mtime="1653216428" />
<entry name="parallel_20220422.tar.gz" md5="4ece6ee823ae7b492081af3991b4ae86" size="2638371" mtime="1653216428" />
<entry name="parallel_20220522.dsc" md5="924717a2e509cc1868b8d0ce0e7621ec" size="556" mtime="1653333335" />
<entry name="parallel_20220522.tar.gz" md5="b2641b739cbf2cdb17fc9b7db9a18913" size="2629816" mtime="1653333335" />
</directory>

0
packager/obs/home:tange/parallel/.osc/_meta → packager/obs/home-tange/parallel/.osc/_meta
View file

0
packager/obs/home:tange/parallel/.osc/_osclib_version → packager/obs/home-tange/parallel/.osc/_osclib_version
View file

0
packager/obs/home:tange/parallel/.osc/_package → packager/obs/home-tange/parallel/.osc/_package
View file

0
packager/obs/home:tange/parallel/.osc/_project → packager/obs/home-tange/parallel/.osc/_project
View file

0
packager/obs/home:tange/parallel/.osc/parallel.spec → packager/obs/home-tange/parallel/.osc/parallel.spec
View file

7
packager/obs/home:tange/parallel/.osc/_files
View file

@ -1,7 +0,0 @@
<directory name="parallel" rev="325" vrev="1" srcmd5="0e4e7b85fb839b1b92a506e1b2992935">
<entry name="PKGBUILD" md5="eef8ab7c0ccf83a0e08cbf0b111047fd" size="936" mtime="1653216427" />
<entry name="parallel-20220522.tar.bz2" md5="3fb2288f04f550dc246c9388558a67bb" size="2372700" mtime="1653216428" />
<entry name="parallel.spec" md5="dfa4b6691d57f32d68d5fe022d0e1801" size="5713" mtime="1653216428" />
<entry name="parallel_20220422.dsc" md5="53564c7e423948f3c25fb82bae7754ee" size="556" mtime="1653216428" />
<entry name="parallel_20220422.tar.gz" md5="4ece6ee823ae7b492081af3991b4ae86" size="2638371" mtime="1653216428" />
</directory>

BIN
testsuite/input-files/testdir.tar.bz2 Normal file
View file

Binary file not shown.

1
testsuite/input-files/testdir/ ab /c' d/ ef"g
View file

@ -1 +0,0 @@
efg

1
testsuite/input-files/testdir/ ab/c"d/ef g
View file

@ -1 +0,0 @@
efg

1
testsuite/input-files/testdir/ ab/c"d/efg
View file

@ -1 +0,0 @@
efg

1
testsuite/input-files/testdir/1-col.txt
View file

@ -1 +0,0 @@
a

4
testsuite/input-files/testdir/2-col.txt
View file

@ -1,4 +0,0 @@
a b
c d
efg
h i j

1
testsuite/input-files/testdir/a b/cd / ef/efg
View file

@ -1 +0,0 @@
efg

1
testsuite/input-files/testdir/a/bar
View file

@ -1 +0,0 @@
bar

1
testsuite/input-files/testdir/a/foo
View file

@ -1 +0,0 @@
foo

1
testsuite/input-files/testdir/a/foo2
View file

@ -1 +0,0 @@
foo

1
testsuite/input-files/testdir/b/bar
View file

@ -1 +0,0 @@
bar

1
testsuite/input-files/testdir/b/foo
View file

@ -1 +0,0 @@
foo

1
testsuite/input-files/testdir2/1-col.txt
View file

@ -1 +0,0 @@
a

4
testsuite/input-files/testdir2/2-col.txt
View file

@ -1,4 +0,0 @@
a b
c d
efg
h i j

1
testsuite/input-files/testdir2/a/bar
View file

@ -1 +0,0 @@
bar

1
testsuite/input-files/testdir2/a/foo
View file

@ -1 +0,0 @@
foo

1
testsuite/input-files/testdir2/a/foo2
View file

@ -1 +0,0 @@
foo

1
testsuite/input-files/testdir2/b/bar
View file

@ -1 +0,0 @@
bar

1
testsuite/input-files/testdir2/b/foo
View file

@ -1 +0,0 @@
foo

BIN
testsuite/input-files/testdir2/中国 (Zhōngguó)/China's (中国) road.jpg
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 8.2 KiB

3
testsuite/tests-to-run/parallel-local15.sh
View file

@ -6,9 +6,10 @@
TMP=/run/shm/parallel_$$ TMP=/run/shm/parallel_$$
rsync -Ha --delete input-files/testdir/ $TMP/ pwd=`pwd`
mkdir -p $TMP mkdir -p $TMP
cd $TMP/ cd $TMP/
tar xjf "$pwd"/input-files/testdir.tar.bz2
echo echo test of cat pipe sh | parallel -j 50 2>&1 echo echo test of cat pipe sh | parallel -j 50 2>&1
find . -name '*.jpg' | parallel -j +0 convert -geometry 120 {} {//}/thumb_{/} find . -name '*.jpg' | parallel -j +0 convert -geometry 120 {} {//}/thumb_{/}

5
testsuite/tests-to-run/parallel-local23.sh
View file

@ -4,9 +4,6 @@
# #
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
rm -rf tmp 2>/dev/null
cp -a input-files/testdir2 tmp
NICEPAR="nice nice parallel" NICEPAR="nice nice parallel"
export NICEPAR export NICEPAR
@ -66,5 +63,3 @@ echo 'bug #43967: Error if there exists a bin/zsh or bin/bash dir (with zsh or b
EOF EOF
rm -rf tmp

5
testsuite/tests-to-run/test35.sh
View file

@ -8,8 +8,11 @@ SERVER1=parallel-server1
SSHUSER1=vagrant SSHUSER1=vagrant
SSHLOGIN1=$SSHUSER1@$SERVER1 SSHLOGIN1=$SSHUSER1@$SERVER1
rsync -Ha --delete input-files/testdir/ tmp/ mkdir -p tmp
cd tmp cd tmp
tar xjf ../input-files/testdir.tar.bz2
#rsync -Ha --delete input-files/testdir/ tmp/
#cd tmp
SERVER2=parallel@parallel-server2 SERVER2=parallel@parallel-server2