From d2753adec5f13e2907037c7066a55d25bc8dab6d Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Mon, 23 May 2022 21:31:44 +0200 Subject: [PATCH] Renamed dirs to Microsoft Windows compatible names. --- packager/obs/Makefile | 28 +++++++++--------- .../{home:tange => home-tange}/.osc/_apiurl | 0 .../{home:tange => home-tange}/.osc/_packages | 0 .../{home:tange => home-tange}/.osc/_project | 0 .../parallel/.osc/_apiurl | 0 packager/obs/home-tange/parallel/.osc/_files | 8 +++++ .../parallel/.osc/_meta | 0 .../parallel/.osc/_osclib_version | 0 .../parallel/.osc/_package | 0 .../parallel/.osc/_project | 0 .../parallel/.osc/parallel.spec | 0 packager/obs/home:tange/parallel/.osc/_files | 7 ----- testsuite/input-files/testdir.tar.bz2 | Bin 0 -> 422 bytes .../input-files/testdir/ ab /c' d/ ef\"g" | 1 - "testsuite/input-files/testdir/ ab/c\"d/ef g" | 1 - "testsuite/input-files/testdir/ ab/c\"d/efg" | 1 - testsuite/input-files/testdir/1-col.txt | 1 - testsuite/input-files/testdir/2-col.txt | 4 --- testsuite/input-files/testdir/a b/cd / ef/efg | 1 - testsuite/input-files/testdir/a/bar | 1 - testsuite/input-files/testdir/a/foo | 1 - testsuite/input-files/testdir/a/foo2 | 1 - testsuite/input-files/testdir/b/bar | 1 - testsuite/input-files/testdir/b/foo | 1 - testsuite/input-files/testdir2/1-col.txt | 1 - testsuite/input-files/testdir2/2-col.txt | 4 --- testsuite/input-files/testdir2/a/bar | 1 - testsuite/input-files/testdir2/a/foo | 1 - testsuite/input-files/testdir2/a/foo2 | 1 - testsuite/input-files/testdir2/b/bar | 1 - testsuite/input-files/testdir2/b/foo | 1 - .../中国 (Zhōngguó)/China's (中国) road.jpg | Bin 8373 -> 0 bytes testsuite/tests-to-run/parallel-local15.sh | 3 +- testsuite/tests-to-run/parallel-local23.sh | 5 ---- testsuite/tests-to-run/test35.sh | 7 +++-- 35 files changed, 29 insertions(+), 53 deletions(-) rename packager/obs/{home:tange => home-tange}/.osc/_apiurl (100%) rename packager/obs/{home:tange => home-tange}/.osc/_packages (100%) rename packager/obs/{home:tange => home-tange}/.osc/_project (100%) rename packager/obs/{home:tange => home-tange}/parallel/.osc/_apiurl (100%) create mode 100644 packager/obs/home-tange/parallel/.osc/_files rename packager/obs/{home:tange => home-tange}/parallel/.osc/_meta (100%) rename packager/obs/{home:tange => home-tange}/parallel/.osc/_osclib_version (100%) rename packager/obs/{home:tange => home-tange}/parallel/.osc/_package (100%) rename packager/obs/{home:tange => home-tange}/parallel/.osc/_project (100%) rename packager/obs/{home:tange => home-tange}/parallel/.osc/parallel.spec (100%) delete mode 100644 packager/obs/home:tange/parallel/.osc/_files create mode 100644 testsuite/input-files/testdir.tar.bz2 delete mode 100644 "testsuite/input-files/testdir/ ab /c' d/ ef\"g" delete mode 100644 "testsuite/input-files/testdir/ ab/c\"d/ef g" delete mode 100644 "testsuite/input-files/testdir/ ab/c\"d/efg" delete mode 100644 testsuite/input-files/testdir/1-col.txt delete mode 100644 testsuite/input-files/testdir/2-col.txt delete mode 100644 testsuite/input-files/testdir/a b/cd / ef/efg delete mode 100644 testsuite/input-files/testdir/a/bar delete mode 100644 testsuite/input-files/testdir/a/foo delete mode 100644 testsuite/input-files/testdir/a/foo2 delete mode 100644 testsuite/input-files/testdir/b/bar delete mode 100644 testsuite/input-files/testdir/b/foo delete mode 100644 testsuite/input-files/testdir2/1-col.txt delete mode 100644 testsuite/input-files/testdir2/2-col.txt delete mode 100644 testsuite/input-files/testdir2/a/bar delete mode 100644 testsuite/input-files/testdir2/a/foo delete mode 100644 testsuite/input-files/testdir2/a/foo2 delete mode 100644 testsuite/input-files/testdir2/b/bar delete mode 100644 testsuite/input-files/testdir2/b/foo delete mode 100644 testsuite/input-files/testdir2/中国 (Zhōngguó)/China's (中国) road.jpg diff --git a/packager/obs/Makefile b/packager/obs/Makefile index 46ee95c4..47b4f701 100644 --- a/packager/obs/Makefile +++ b/packager/obs/Makefile @@ -1,26 +1,26 @@ all: perl -e 'exit $$ENV{YYYYMMDD} !~ /20/' cd ../debian/ && make - osc rm home\:tange/parallel/parallel_*.dsc || true - 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/ - perl -i -pe '/Version:/ and s/20\d\d\d\d\d\d/$$ENV{YYYYMMDD}/g' home:tange/parallel/parallel.spec + osc rm home-tange/parallel/parallel_*.dsc || true + 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/ + perl -i -pe '/Version:/ and s/20\d\d\d\d\d\d/$$ENV{YYYYMMDD}/g' home-tange/parallel/parallel.spec # 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 - cd home:tange/parallel && perl -i -pe 's/pkgver=.*/pkgver=$$ENV{YYYYMMDD}/' PKGBUILD - cd home\:tange/parallel/ && osc diff - 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/ && osc ci -m "New release" + cd home-tange/parallel && perl -i -pe 's/pkgver=.*/pkgver=$$ENV{YYYYMMDD}/' PKGBUILD + cd home-tange/parallel/ && osc diff + 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/ && osc ci -m "New release" ### Wait for "building" state to complete 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 '### 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' - 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' - 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).*{}"' diff --git a/packager/obs/home:tange/.osc/_apiurl b/packager/obs/home-tange/.osc/_apiurl similarity index 100% rename from packager/obs/home:tange/.osc/_apiurl rename to packager/obs/home-tange/.osc/_apiurl diff --git a/packager/obs/home:tange/.osc/_packages b/packager/obs/home-tange/.osc/_packages similarity index 100% rename from packager/obs/home:tange/.osc/_packages rename to packager/obs/home-tange/.osc/_packages diff --git a/packager/obs/home:tange/.osc/_project b/packager/obs/home-tange/.osc/_project similarity index 100% rename from packager/obs/home:tange/.osc/_project rename to packager/obs/home-tange/.osc/_project diff --git a/packager/obs/home:tange/parallel/.osc/_apiurl b/packager/obs/home-tange/parallel/.osc/_apiurl similarity index 100% rename from packager/obs/home:tange/parallel/.osc/_apiurl rename to packager/obs/home-tange/parallel/.osc/_apiurl diff --git a/packager/obs/home-tange/parallel/.osc/_files b/packager/obs/home-tange/parallel/.osc/_files new file mode 100644 index 00000000..aa01fefa --- /dev/null +++ b/packager/obs/home-tange/parallel/.osc/_files @@ -0,0 +1,8 @@ + + + + + + + + diff --git a/packager/obs/home:tange/parallel/.osc/_meta b/packager/obs/home-tange/parallel/.osc/_meta similarity index 100% rename from packager/obs/home:tange/parallel/.osc/_meta rename to packager/obs/home-tange/parallel/.osc/_meta diff --git a/packager/obs/home:tange/parallel/.osc/_osclib_version b/packager/obs/home-tange/parallel/.osc/_osclib_version similarity index 100% rename from packager/obs/home:tange/parallel/.osc/_osclib_version rename to packager/obs/home-tange/parallel/.osc/_osclib_version diff --git a/packager/obs/home:tange/parallel/.osc/_package b/packager/obs/home-tange/parallel/.osc/_package similarity index 100% rename from packager/obs/home:tange/parallel/.osc/_package rename to packager/obs/home-tange/parallel/.osc/_package diff --git a/packager/obs/home:tange/parallel/.osc/_project b/packager/obs/home-tange/parallel/.osc/_project similarity index 100% rename from packager/obs/home:tange/parallel/.osc/_project rename to packager/obs/home-tange/parallel/.osc/_project diff --git a/packager/obs/home:tange/parallel/.osc/parallel.spec b/packager/obs/home-tange/parallel/.osc/parallel.spec similarity index 100% rename from packager/obs/home:tange/parallel/.osc/parallel.spec rename to packager/obs/home-tange/parallel/.osc/parallel.spec diff --git a/packager/obs/home:tange/parallel/.osc/_files b/packager/obs/home:tange/parallel/.osc/_files deleted file mode 100644 index 1602ebf7..00000000 --- a/packager/obs/home:tange/parallel/.osc/_files +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - diff --git a/testsuite/input-files/testdir.tar.bz2 b/testsuite/input-files/testdir.tar.bz2 new file mode 100644 index 0000000000000000000000000000000000000000..e620961af02e89fb897696cdce4aaa318dabc4a5 GIT binary patch literal 422 zcmV;X0a^Y+T4*^jL0KkKSw{FFbpQdE|AoVp0Dw?~|9}7hpLKuro0&| zO*Yi^PijNd<-HTd_C#ty?&5JMJ;HV=k|xDHVn76V0zeg2-GCkk6A=lzQbZ#PM2N>h zrifsK>ME8b2@0ZQB6cD|izu3PKG&vW$MwRw3T#BWC2a&1MC)894aFS%^r=ynUdz*% zHqMZtwBHiDb~kXg^#L+M6v$A9wu;g!rqvUA9pbCN&@|6H&L+B;)Yl#guQ-XeQ6xm# z#U&v5%_0&ANFhoP(F1Lg#C=2pu>%PZjV_Z@-s|muIFfXnfr6!Sns&BAa*%GO#4ck1 z;S2-s6BhEkUtpA|iBu~nkPHb3VVsjSzpxoQ{-F>L(;mBa$as QWf%S~KBo&v;Y7A literal 0 HcmV?d00001 diff --git "a/testsuite/input-files/testdir/ ab /c' d/ ef\"g" "b/testsuite/input-files/testdir/ ab /c' d/ ef\"g" deleted file mode 100644 index 1505b408..00000000 --- "a/testsuite/input-files/testdir/ ab /c' d/ ef\"g" +++ /dev/null @@ -1 +0,0 @@ -efg diff --git "a/testsuite/input-files/testdir/ ab/c\"d/ef g" "b/testsuite/input-files/testdir/ ab/c\"d/ef g" deleted file mode 100644 index 1505b408..00000000 --- "a/testsuite/input-files/testdir/ ab/c\"d/ef g" +++ /dev/null @@ -1 +0,0 @@ -efg diff --git "a/testsuite/input-files/testdir/ ab/c\"d/efg" "b/testsuite/input-files/testdir/ ab/c\"d/efg" deleted file mode 100644 index 1505b408..00000000 --- "a/testsuite/input-files/testdir/ ab/c\"d/efg" +++ /dev/null @@ -1 +0,0 @@ -efg diff --git a/testsuite/input-files/testdir/1-col.txt b/testsuite/input-files/testdir/1-col.txt deleted file mode 100644 index 78981922..00000000 --- a/testsuite/input-files/testdir/1-col.txt +++ /dev/null @@ -1 +0,0 @@ -a diff --git a/testsuite/input-files/testdir/2-col.txt b/testsuite/input-files/testdir/2-col.txt deleted file mode 100644 index 34cdda44..00000000 --- a/testsuite/input-files/testdir/2-col.txt +++ /dev/null @@ -1,4 +0,0 @@ -a b -c d -efg -h i j diff --git a/testsuite/input-files/testdir/a b/cd / ef/efg b/testsuite/input-files/testdir/a b/cd / ef/efg deleted file mode 100644 index 1505b408..00000000 --- a/testsuite/input-files/testdir/a b/cd / ef/efg +++ /dev/null @@ -1 +0,0 @@ -efg diff --git a/testsuite/input-files/testdir/a/bar b/testsuite/input-files/testdir/a/bar deleted file mode 100644 index 5716ca59..00000000 --- a/testsuite/input-files/testdir/a/bar +++ /dev/null @@ -1 +0,0 @@ -bar diff --git a/testsuite/input-files/testdir/a/foo b/testsuite/input-files/testdir/a/foo deleted file mode 100644 index 257cc564..00000000 --- a/testsuite/input-files/testdir/a/foo +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/testsuite/input-files/testdir/a/foo2 b/testsuite/input-files/testdir/a/foo2 deleted file mode 100644 index 257cc564..00000000 --- a/testsuite/input-files/testdir/a/foo2 +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/testsuite/input-files/testdir/b/bar b/testsuite/input-files/testdir/b/bar deleted file mode 100644 index 5716ca59..00000000 --- a/testsuite/input-files/testdir/b/bar +++ /dev/null @@ -1 +0,0 @@ -bar diff --git a/testsuite/input-files/testdir/b/foo b/testsuite/input-files/testdir/b/foo deleted file mode 100644 index 257cc564..00000000 --- a/testsuite/input-files/testdir/b/foo +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/testsuite/input-files/testdir2/1-col.txt b/testsuite/input-files/testdir2/1-col.txt deleted file mode 100644 index 78981922..00000000 --- a/testsuite/input-files/testdir2/1-col.txt +++ /dev/null @@ -1 +0,0 @@ -a diff --git a/testsuite/input-files/testdir2/2-col.txt b/testsuite/input-files/testdir2/2-col.txt deleted file mode 100644 index 34cdda44..00000000 --- a/testsuite/input-files/testdir2/2-col.txt +++ /dev/null @@ -1,4 +0,0 @@ -a b -c d -efg -h i j diff --git a/testsuite/input-files/testdir2/a/bar b/testsuite/input-files/testdir2/a/bar deleted file mode 100644 index 5716ca59..00000000 --- a/testsuite/input-files/testdir2/a/bar +++ /dev/null @@ -1 +0,0 @@ -bar diff --git a/testsuite/input-files/testdir2/a/foo b/testsuite/input-files/testdir2/a/foo deleted file mode 100644 index 257cc564..00000000 --- a/testsuite/input-files/testdir2/a/foo +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/testsuite/input-files/testdir2/a/foo2 b/testsuite/input-files/testdir2/a/foo2 deleted file mode 100644 index 257cc564..00000000 --- a/testsuite/input-files/testdir2/a/foo2 +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/testsuite/input-files/testdir2/b/bar b/testsuite/input-files/testdir2/b/bar deleted file mode 100644 index 5716ca59..00000000 --- a/testsuite/input-files/testdir2/b/bar +++ /dev/null @@ -1 +0,0 @@ -bar diff --git a/testsuite/input-files/testdir2/b/foo b/testsuite/input-files/testdir2/b/foo deleted file mode 100644 index 257cc564..00000000 --- a/testsuite/input-files/testdir2/b/foo +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/testsuite/input-files/testdir2/中国 (Zhōngguó)/China's (中国) road.jpg b/testsuite/input-files/testdir2/中国 (Zhōngguó)/China's (中国) road.jpg deleted file mode 100644 index 26e6b63d4676c1d18dbfbd3ddfb4c64d325b6c7c..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 8373 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 I+1c#>0YD0?ApigX diff --git a/testsuite/tests-to-run/parallel-local15.sh b/testsuite/tests-to-run/parallel-local15.sh index 2d140b0f..c4ed9825 100755 --- a/testsuite/tests-to-run/parallel-local15.sh +++ b/testsuite/tests-to-run/parallel-local15.sh @@ -6,9 +6,10 @@ TMP=/run/shm/parallel_$$ -rsync -Ha --delete input-files/testdir/ $TMP/ +pwd=`pwd` mkdir -p $TMP cd $TMP/ +tar xjf "$pwd"/input-files/testdir.tar.bz2 echo echo test of cat pipe sh | parallel -j 50 2>&1 find . -name '*.jpg' | parallel -j +0 convert -geometry 120 {} {//}/thumb_{/} diff --git a/testsuite/tests-to-run/parallel-local23.sh b/testsuite/tests-to-run/parallel-local23.sh index 762dd757..0d4f42c1 100755 --- a/testsuite/tests-to-run/parallel-local23.sh +++ b/testsuite/tests-to-run/parallel-local23.sh @@ -4,9 +4,6 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -rm -rf tmp 2>/dev/null -cp -a input-files/testdir2 tmp - NICEPAR="nice nice parallel" 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 - -rm -rf tmp diff --git a/testsuite/tests-to-run/test35.sh b/testsuite/tests-to-run/test35.sh index ebeb6be6..1e30c651 100755 --- a/testsuite/tests-to-run/test35.sh +++ b/testsuite/tests-to-run/test35.sh @@ -7,9 +7,12 @@ SERVER1=parallel-server1 SSHUSER1=vagrant SSHLOGIN1=$SSHUSER1@$SERVER1 - -rsync -Ha --delete input-files/testdir/ tmp/ + +mkdir -p tmp cd tmp +tar xjf ../input-files/testdir.tar.bz2 +#rsync -Ha --delete input-files/testdir/ tmp/ +#cd tmp SERVER2=parallel@parallel-server2