diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/pkg-build.test | 2 | ||||
| -rwxr-xr-x | tests/publish | 4 | ||||
| -rw-r--r-- | tests/remote.test | 2 | ||||
| -rw-r--r-- | tests/rep-add.test | 38 | ||||
| -rw-r--r-- | tests/rep-auth.test | 70 | ||||
| -rw-r--r-- | tests/rep-fetch.test | 148 | ||||
| -rw-r--r-- | tests/rep-info.test | 22 | ||||
| -rw-r--r-- | tests/rep-list.test | 34 | ||||
| -rw-r--r-- | tests/rep-remove.test | 22 |
9 files changed, 171 insertions, 171 deletions
diff --git a/tests/pkg-build.test b/tests/pkg-build.test index b7d7fff..b1ba0c8 100644 --- a/tests/pkg-build.test +++ b/tests/pkg-build.test @@ -1442,7 +1442,7 @@ rep_fetch += -d cfg --auth all --trust-yes 2>! $* "libbar@$rep/t4d" 2>>~%EOE% != 0 %.+ - error: package libbar is not found in bpkg:build2.org/pkg-build/t4d or its complements + error: package libbar is not found in pkg:build2.org/pkg-build/t4d or its complements EOE } } diff --git a/tests/publish b/tests/publish index 5d1e928..21c7898 100755 --- a/tests/publish +++ b/tests/publish @@ -22,7 +22,7 @@ for o in "$@"; do esac done -# Publish bpkg test repositories. +# Publish test pkg repositories. # rsync -v -rlpt --copy-unsafe-links \ --prune-empty-dirs --delete-after --delete-excluded $* \ @@ -34,7 +34,7 @@ rsync -v -rlpt --copy-unsafe-links \ --exclude '*' \ test/*/pkg/1/build2.org/ build2.org:/var/pkg/1/ -# Publish git test repositories. +# Publish test git repositories. # urls=('git.build2.org:/var/scm/testing/bpkg/unadv' \ 'git.build2.org:/var/scm/testing/bpkg/advonly') diff --git a/tests/remote.test b/tests/remote.test index af0c6f6..78a65af 100644 --- a/tests/remote.test +++ b/tests/remote.test @@ -2,7 +2,7 @@ # copyright : Copyright (c) 2014-2017 Code Synthesis Ltd # license : MIT; see accompanying LICENSE file -# Tests for commands that accept bpkg repository location must be able to run +# Tests for commands that accept pkg repository location must be able to run # regardless whether the repository is local or remote. They also must be able # to create the repository used for testing at the specified path, so being # published to build2.org it can be used for the remote testing. Note that diff --git a/tests/rep-add.test b/tests/rep-add.test index c96b32b..8ee1b9d 100644 --- a/tests/rep-add.test +++ b/tests/rep-add.test @@ -40,7 +40,7 @@ rep_list += -d cfg $clone_cfg; $* 'stable' 2>>/~%EOE% != 0 - %error: invalid bpkg repository location '.+/no-version/stable': missing repository version% + %error: invalid pkg repository location '.+/no-version/stable': missing repository version% info: consider using --type to specify repository type EOE } @@ -55,13 +55,13 @@ rep_list += -d cfg EOE } - : bpkg-git-scheme + : pkg-git-scheme : { $clone_cfg; - $* 'git://example.org/repo' --type bpkg 2>>EOE != 0 - error: invalid bpkg repository location 'git://example.org/repo': unsupported scheme for bpkg repository + $* 'git://example.org/repo' --type pkg 2>>EOE != 0 + error: invalid pkg repository location 'git://example.org/repo': unsupported scheme for pkg repository EOE } @@ -97,11 +97,11 @@ rep_list += -d cfg added git:example.org/repo#master EOE - : http-bpkg + : http-pkg : $clone_cfg; $* 'http://example.org/1/repo' 2>>EOE - added bpkg:example.org/repo + added pkg:example.org/repo EOE : file-git @@ -112,7 +112,7 @@ rep_list += -d cfg %error: invalid git repository location '.+repo': missing branch/tag or commit id for git repository% EOE - : file-bpkg + : file-pkg : $clone_cfg; @@ -128,11 +128,11 @@ rep_list += -d cfg $clone_cfg; $* ./1/bar/stable 2>>/~%EOE%; - %added bpkg:.+/relative-path/bar/stable% + %added pkg:.+/relative-path/bar/stable% EOE $* ./1/../1/bar/stable 2>>/~%EOE% - %unchanged bpkg:.+/relative-path/bar/stable% + %unchanged pkg:.+/relative-path/bar/stable% EOE } @@ -142,11 +142,11 @@ rep_list += -d cfg $clone_cfg; $* $~/1/foo/stable 2>>/~%EOE%; - %added bpkg:.+/absolute-path/foo/stable% + %added pkg:.+/absolute-path/foo/stable% EOE $* $~/1/../1/foo/stable 2>>/~%EOE% - %unchanged bpkg:.+/absolute-path/foo/stable% + %unchanged pkg:.+/absolute-path/foo/stable% EOE } @@ -155,20 +155,20 @@ rep_list += -d cfg { +$clone_cfg - : bpkg + : pkg : $clone_cfg; $* 'http://pkg.example.org/1/testing' 2>>EOE; - added bpkg:example.org/testing + added pkg:example.org/testing EOE $* 'https://www.example.org/1/testing' 2>>EOE; - updated bpkg:example.org/testing + updated pkg:example.org/testing EOE $rep_list >>EOO - bpkg:example.org/testing https://www.example.org/1/testing + pkg:example.org/testing https://www.example.org/1/testing EOO : git @@ -194,12 +194,12 @@ rep_list += -d cfg $clone_cfg; $* 'http://pkg.example.org/1/alpha' 'http://pkg.example.org/1/beta' 2>>EOE; - added bpkg:example.org/alpha - added bpkg:example.org/beta + added pkg:example.org/alpha + added pkg:example.org/beta EOE $rep_list >>EOO - bpkg:example.org/alpha http://pkg.example.org/1/alpha - bpkg:example.org/beta http://pkg.example.org/1/beta + pkg:example.org/alpha http://pkg.example.org/1/alpha + pkg:example.org/beta http://pkg.example.org/1/beta EOO } diff --git a/tests/rep-auth.test b/tests/rep-auth.test index 336397b..1fb7d97 100644 --- a/tests/rep-auth.test +++ b/tests/rep-auth.test @@ -173,8 +173,8 @@ sc = " " # Space character to append to here-document line when required. $clone_cfg; $rep_fetch 2>>"EOE" != 0; - fetching bpkg:build2.org/rep-auth/signed - warning: authenticity of the certificate for repository bpkg:build2.org/rep-auth/signed cannot be established + fetching pkg:build2.org/rep-auth/signed + warning: authenticity of the certificate for repository pkg:build2.org/rep-auth/signed cannot be established certificate is for build2.org, "Code Synthesis" <info@build2.org> certificate SHA256 fingerprint: $cert_fp @@ -191,7 +191,7 @@ sc = " " # Space character to append to here-document line when required. $clone_cfg; $rep_fetch --trust $cert_fp 2>>EOE; - fetching bpkg:build2.org/rep-auth/signed + fetching pkg:build2.org/rep-auth/signed 1 package(s) in 1 repository(s) EOE @@ -204,7 +204,7 @@ sc = " " # Space character to append to here-document line when required. $clone_cfg; $rep_fetch --trust-no --trust $cert_fp 2>>EOE; - fetching bpkg:build2.org/rep-auth/signed + fetching pkg:build2.org/rep-auth/signed 1 package(s) in 1 repository(s) EOE @@ -217,7 +217,7 @@ sc = " " # Space character to append to here-document line when required. $clone_cfg; $rep_fetch --trust-yes 2>>EOE; - fetching bpkg:build2.org/rep-auth/signed + fetching pkg:build2.org/rep-auth/signed 1 package(s) in 1 repository(s) EOE @@ -230,8 +230,8 @@ sc = " " # Space character to append to here-document line when required. $clone_cfg; $rep_fetch --trust-no 2>>EOE != 0; - fetching bpkg:build2.org/rep-auth/signed - error: authenticity of the certificate for repository bpkg:build2.org/rep-auth/signed cannot be established + fetching pkg:build2.org/rep-auth/signed + error: authenticity of the certificate for repository pkg:build2.org/rep-auth/signed cannot be established EOE $not_fetched @@ -243,7 +243,7 @@ sc = " " # Space character to append to here-document line when required. $clone_cfg; $rep_fetch --trust-yes --trust-no 2>>EOE != 0; - fetching bpkg:build2.org/rep-auth/signed + fetching pkg:build2.org/rep-auth/signed error: --trust-yes and --trust-no are mutually exclusive EOE @@ -256,19 +256,19 @@ sc = " " # Space character to append to here-document line when required. $clone_cfg; $rep_fetch --trust-yes 2>>EOE; - fetching bpkg:build2.org/rep-auth/signed + fetching pkg:build2.org/rep-auth/signed 1 package(s) in 1 repository(s) EOE $rep_fetch 2>>EOE; - fetching bpkg:build2.org/rep-auth/signed + fetching pkg:build2.org/rep-auth/signed 1 package(s) in 1 repository(s) EOE $fetched; $rep_fetch --trust-no 2>>EOE; - fetching bpkg:build2.org/rep-auth/signed + fetching pkg:build2.org/rep-auth/signed 1 package(s) in 1 repository(s) EOE @@ -284,7 +284,7 @@ sc = " " # Space character to append to here-document line when required. : no-auth : $rep_info 2>>"EOE" != 0 - warning: authenticity of the certificate for repository bpkg:build2.org/rep-auth/signed cannot be established + warning: authenticity of the certificate for repository pkg:build2.org/rep-auth/signed cannot be established certificate is for build2.org, "Code Synthesis" <info@build2.org> certificate SHA256 fingerprint: $cert_fp @@ -303,7 +303,7 @@ sc = " " # Space character to append to here-document line when required. : trust-no : $rep_info --trust-no 2>>EOE != 0 - error: authenticity of the certificate for repository bpkg:build2.org/rep-auth/signed cannot be established + error: authenticity of the certificate for repository pkg:build2.org/rep-auth/signed cannot be established EOE : already-trusted @@ -354,7 +354,7 @@ sc = " " # Space character to append to here-document line when required. cp -r $rep/self-match $r; $rep_info $r/self-match 2>>EOE != 0 - error: certificate name mismatch for repository bpkg:b.a.build2.org/self-match + error: certificate name mismatch for repository pkg:b.a.build2.org/self-match info: certificate name is *build2.org EOE } @@ -400,7 +400,7 @@ sc = " " # Space character to append to here-document line when required. : exact : $rep_info $rep/subdomain-match 2>>EOE != 0 - error: certificate name mismatch for repository bpkg:build2.org/rep-auth/subdomain-match + error: certificate name mismatch for repository pkg:build2.org/rep-auth/subdomain-match info: certificate name is *.build2.org EOE @@ -426,7 +426,7 @@ sc = " " # Space character to append to here-document line when required. cp -r $rep/subdomain-match $r; $rep_info $r/subdomain-match 2>>EOE != 0 - error: certificate name mismatch for repository bpkg:b.a.build2.org/subdomain-match + error: certificate name mismatch for repository pkg:b.a.build2.org/subdomain-match info: certificate name is *.build2.org EOE } @@ -450,8 +450,8 @@ sc = " " # Space character to append to here-document line when required. $clone_cfg; $rep_fetch 2>>~%EOE% != 0; - fetching bpkg:build2.org/rep-auth/unsigned1 - warning: repository bpkg:build2.org/rep-auth/unsigned1 is unsigned + fetching pkg:build2.org/rep-auth/unsigned1 + warning: repository pkg:build2.org/rep-auth/unsigned1 is unsigned %continue without authenticating repositories at .+\? \[y/n\] % error: unable to read y/n answer from STDOUT EOE @@ -465,7 +465,7 @@ sc = " " # Space character to append to here-document line when required. $clone_cfg; $rep_fetch --trust-yes 2>>EOE; - fetching bpkg:build2.org/rep-auth/unsigned1 + fetching pkg:build2.org/rep-auth/unsigned1 1 package(s) in 1 repository(s) EOE @@ -478,8 +478,8 @@ sc = " " # Space character to append to here-document line when required. $clone_cfg; $rep_fetch --trust-no 2>>EOE != 0; - fetching bpkg:build2.org/rep-auth/unsigned1 - error: repository bpkg:build2.org/rep-auth/unsigned1 is unsigned + fetching pkg:build2.org/rep-auth/unsigned1 + error: repository pkg:build2.org/rep-auth/unsigned1 is unsigned EOE $not_fetched @@ -491,19 +491,19 @@ sc = " " # Space character to append to here-document line when required. $clone_cfg; $rep_fetch --trust-yes 2>>EOE; - fetching bpkg:build2.org/rep-auth/unsigned1 + fetching pkg:build2.org/rep-auth/unsigned1 1 package(s) in 1 repository(s) EOE $rep_fetch 2>>EOE; - fetching bpkg:build2.org/rep-auth/unsigned1 + fetching pkg:build2.org/rep-auth/unsigned1 1 package(s) in 1 repository(s) EOE $fetched; $rep_fetch --trust-no 2>>EOE; - fetching bpkg:build2.org/rep-auth/unsigned1 + fetching pkg:build2.org/rep-auth/unsigned1 1 package(s) in 1 repository(s) EOE @@ -512,8 +512,8 @@ sc = " " # Space character to append to here-document line when required. $rep_add $rep/unsigned2; $rep_fetch 2>>EOE; - fetching bpkg:build2.org/rep-auth/unsigned1 - fetching bpkg:build2.org/rep-auth/unsigned2 + fetching pkg:build2.org/rep-auth/unsigned1 + fetching pkg:build2.org/rep-auth/unsigned2 1 package(s) in 2 repository(s) EOE @@ -529,7 +529,7 @@ sc = " " # Space character to append to here-document line when required. : no-auth : $rep_info 2>>~%EOE% != 0 - warning: repository bpkg:build2.org/rep-auth/unsigned1 is unsigned + warning: repository pkg:build2.org/rep-auth/unsigned1 is unsigned %continue without authenticating repositories at .+\? \[y/n\] % error: unable to read y/n answer from STDOUT EOE @@ -537,13 +537,13 @@ sc = " " # Space character to append to here-document line when required. : trust-yes : $rep_info --trust-yes >>"EOO" - bpkg:build2.org/rep-auth/unsigned1 ($rep/unsigned1) + pkg:build2.org/rep-auth/unsigned1 ($rep/unsigned1) EOO : trust-no : $rep_info --trust-no 2>>EOE != 0 - error: repository bpkg:build2.org/rep-auth/unsigned1 is unsigned + error: repository pkg:build2.org/rep-auth/unsigned1 is unsigned EOE : already-trusted @@ -553,10 +553,10 @@ sc = " " # Space character to append to here-document line when required. rep_info += -d cfg; $rep_info --trust-yes >>"EOO"; - bpkg:build2.org/rep-auth/unsigned1 ($rep/unsigned1) + pkg:build2.org/rep-auth/unsigned1 ($rep/unsigned1) EOO $rep_info >>"EOO" - bpkg:build2.org/rep-auth/unsigned1 ($rep/unsigned1) + pkg:build2.org/rep-auth/unsigned1 ($rep/unsigned1) EOO } } @@ -570,20 +570,20 @@ sc = " " # Space character to append to here-document line when required. : name-mismatch : $rep_info $rep/name-mismatch 2>>EOE != 0 - error: certificate name mismatch for repository bpkg:build2.org/rep-auth/name-mismatch + error: certificate name mismatch for repository pkg:build2.org/rep-auth/name-mismatch info: certificate name is build2.org/mismatched/name EOE : expired : $rep_info $rep/expired 2>>EOE != 0 - error: certificate for repository bpkg:build2.org/rep-auth/expired has expired + error: certificate for repository pkg:build2.org/rep-auth/expired has expired EOE : sha256sum-mismatch : $rep_info $rep/sha256sum-mismatch 2>>EOE != 0 - error: packages manifest file checksum mismatch for bpkg:build2.org/rep-auth/sha256sum-mismatch + error: packages manifest file checksum mismatch for pkg:build2.org/rep-auth/sha256sum-mismatch info: try again EOE @@ -591,7 +591,7 @@ sc = " " # Space character to append to here-document line when required. : $rep_info $rep/signature-mismatch 2>>~%EOE% != 0 %.* - %error: unable to authenticate repository bpkg:build2.org/rep-auth/signature-mismatch: .*% + %error: unable to authenticate repository pkg:build2.org/rep-auth/signature-mismatch: .*% EOE : create-rep diff --git a/tests/rep-fetch.test b/tests/rep-fetch.test index 527a07b..237ee6a 100644 --- a/tests/rep-fetch.test +++ b/tests/rep-fetch.test @@ -112,7 +112,7 @@ $* 2>>/EOE != 0 info: use 'bpkg rep-add' to add a repository EOE -: bpkg-repos +: pkg-repos : { test.options += --auth all @@ -123,12 +123,12 @@ $* 2>>/EOE != 0 $clone_root_cfg && $rep_add $rep/hello; $* --trust $cert_fp 2>>EOE &cfg/.bpkg/certs/**; - fetching bpkg:build2.org/rep-fetch/hello + fetching pkg:build2.org/rep-fetch/hello 1 package(s) in 1 repository(s) EOE $* 2>>EOE - fetching bpkg:build2.org/rep-fetch/hello + fetching pkg:build2.org/rep-fetch/hello 1 package(s) in 1 repository(s) EOE } @@ -139,20 +139,20 @@ $* 2>>/EOE != 0 $clone_root_cfg && $rep_add $rep/bar/unstable; $* --trust-yes 2>>EOE; - fetching bpkg:build2.org/rep-fetch/bar/unstable - fetching bpkg:build2.org/rep-fetch/foo/testing (prerequisite of bpkg:build2.org/rep-fetch/bar/unstable) - fetching bpkg:build2.org/rep-fetch/foo/stable (complements bpkg:build2.org/rep-fetch/foo/testing) - fetching bpkg:build2.org/rep-fetch/bar/testing (complements bpkg:build2.org/rep-fetch/bar/unstable) - fetching bpkg:build2.org/rep-fetch/bar/stable (complements bpkg:build2.org/rep-fetch/bar/testing) + fetching pkg:build2.org/rep-fetch/bar/unstable + fetching pkg:build2.org/rep-fetch/foo/testing (prerequisite of pkg:build2.org/rep-fetch/bar/unstable) + fetching pkg:build2.org/rep-fetch/foo/stable (complements pkg:build2.org/rep-fetch/foo/testing) + fetching pkg:build2.org/rep-fetch/bar/testing (complements pkg:build2.org/rep-fetch/bar/unstable) + fetching pkg:build2.org/rep-fetch/bar/stable (complements pkg:build2.org/rep-fetch/bar/testing) 5 package(s) in 5 repository(s) EOE $* 2>>EOE - fetching bpkg:build2.org/rep-fetch/bar/unstable - fetching bpkg:build2.org/rep-fetch/foo/testing (prerequisite of bpkg:build2.org/rep-fetch/bar/unstable) - fetching bpkg:build2.org/rep-fetch/foo/stable (complements bpkg:build2.org/rep-fetch/foo/testing) - fetching bpkg:build2.org/rep-fetch/bar/testing (complements bpkg:build2.org/rep-fetch/bar/unstable) - fetching bpkg:build2.org/rep-fetch/bar/stable (complements bpkg:build2.org/rep-fetch/bar/testing) + fetching pkg:build2.org/rep-fetch/bar/unstable + fetching pkg:build2.org/rep-fetch/foo/testing (prerequisite of pkg:build2.org/rep-fetch/bar/unstable) + fetching pkg:build2.org/rep-fetch/foo/stable (complements pkg:build2.org/rep-fetch/foo/testing) + fetching pkg:build2.org/rep-fetch/bar/testing (complements pkg:build2.org/rep-fetch/bar/unstable) + fetching pkg:build2.org/rep-fetch/bar/stable (complements pkg:build2.org/rep-fetch/bar/testing) 5 package(s) in 5 repository(s) EOE } @@ -163,22 +163,22 @@ $* 2>>/EOE != 0 $clone_root_cfg && $rep_add $rep/hello $rep/bar/unstable; $* --trust-yes 2>>EOE &cfg/.bpkg/certs/**; - fetching bpkg:build2.org/rep-fetch/bar/unstable - fetching bpkg:build2.org/rep-fetch/foo/testing (prerequisite of bpkg:build2.org/rep-fetch/bar/unstable) - fetching bpkg:build2.org/rep-fetch/foo/stable (complements bpkg:build2.org/rep-fetch/foo/testing) - fetching bpkg:build2.org/rep-fetch/bar/testing (complements bpkg:build2.org/rep-fetch/bar/unstable) - fetching bpkg:build2.org/rep-fetch/bar/stable (complements bpkg:build2.org/rep-fetch/bar/testing) - fetching bpkg:build2.org/rep-fetch/hello + fetching pkg:build2.org/rep-fetch/bar/unstable + fetching pkg:build2.org/rep-fetch/foo/testing (prerequisite of pkg:build2.org/rep-fetch/bar/unstable) + fetching pkg:build2.org/rep-fetch/foo/stable (complements pkg:build2.org/rep-fetch/foo/testing) + fetching pkg:build2.org/rep-fetch/bar/testing (complements pkg:build2.org/rep-fetch/bar/unstable) + fetching pkg:build2.org/rep-fetch/bar/stable (complements pkg:build2.org/rep-fetch/bar/testing) + fetching pkg:build2.org/rep-fetch/hello 6 package(s) in 6 repository(s) EOE $* 2>>EOE - fetching bpkg:build2.org/rep-fetch/bar/unstable - fetching bpkg:build2.org/rep-fetch/foo/testing (prerequisite of bpkg:build2.org/rep-fetch/bar/unstable) - fetching bpkg:build2.org/rep-fetch/foo/stable (complements bpkg:build2.org/rep-fetch/foo/testing) - fetching bpkg:build2.org/rep-fetch/bar/testing (complements bpkg:build2.org/rep-fetch/bar/unstable) - fetching bpkg:build2.org/rep-fetch/bar/stable (complements bpkg:build2.org/rep-fetch/bar/testing) - fetching bpkg:build2.org/rep-fetch/hello + fetching pkg:build2.org/rep-fetch/bar/unstable + fetching pkg:build2.org/rep-fetch/foo/testing (prerequisite of pkg:build2.org/rep-fetch/bar/unstable) + fetching pkg:build2.org/rep-fetch/foo/stable (complements pkg:build2.org/rep-fetch/foo/testing) + fetching pkg:build2.org/rep-fetch/bar/testing (complements pkg:build2.org/rep-fetch/bar/unstable) + fetching pkg:build2.org/rep-fetch/bar/stable (complements pkg:build2.org/rep-fetch/bar/testing) + fetching pkg:build2.org/rep-fetch/hello 6 package(s) in 6 repository(s) EOE } @@ -189,33 +189,33 @@ $* 2>>/EOE != 0 $clone_root_cfg; $* --trust-yes $rep/bar/unstable 2>>EOE; - added bpkg:build2.org/rep-fetch/bar/unstable - fetching bpkg:build2.org/rep-fetch/bar/unstable - fetching bpkg:build2.org/rep-fetch/foo/testing (prerequisite of bpkg:build2.org/rep-fetch/bar/unstable) - fetching bpkg:build2.org/rep-fetch/foo/stable (complements bpkg:build2.org/rep-fetch/foo/testing) - fetching bpkg:build2.org/rep-fetch/bar/testing (complements bpkg:build2.org/rep-fetch/bar/unstable) - fetching bpkg:build2.org/rep-fetch/bar/stable (complements bpkg:build2.org/rep-fetch/bar/testing) + added pkg:build2.org/rep-fetch/bar/unstable + fetching pkg:build2.org/rep-fetch/bar/unstable + fetching pkg:build2.org/rep-fetch/foo/testing (prerequisite of pkg:build2.org/rep-fetch/bar/unstable) + fetching pkg:build2.org/rep-fetch/foo/stable (complements pkg:build2.org/rep-fetch/foo/testing) + fetching pkg:build2.org/rep-fetch/bar/testing (complements pkg:build2.org/rep-fetch/bar/unstable) + fetching pkg:build2.org/rep-fetch/bar/stable (complements pkg:build2.org/rep-fetch/bar/testing) 5 package(s) in 5 repository(s) EOE - $* 'bpkg:build2.org/rep-fetch/bar/unstable' 2>>EOE; - fetching bpkg:build2.org/rep-fetch/bar/unstable - fetching bpkg:build2.org/rep-fetch/foo/testing (prerequisite of bpkg:build2.org/rep-fetch/bar/unstable) - fetching bpkg:build2.org/rep-fetch/foo/stable (complements bpkg:build2.org/rep-fetch/foo/testing) - fetching bpkg:build2.org/rep-fetch/bar/testing (complements bpkg:build2.org/rep-fetch/bar/unstable) - fetching bpkg:build2.org/rep-fetch/bar/stable (complements bpkg:build2.org/rep-fetch/bar/testing) + $* 'pkg:build2.org/rep-fetch/bar/unstable' 2>>EOE; + fetching pkg:build2.org/rep-fetch/bar/unstable + fetching pkg:build2.org/rep-fetch/foo/testing (prerequisite of pkg:build2.org/rep-fetch/bar/unstable) + fetching pkg:build2.org/rep-fetch/foo/stable (complements pkg:build2.org/rep-fetch/foo/testing) + fetching pkg:build2.org/rep-fetch/bar/testing (complements pkg:build2.org/rep-fetch/bar/unstable) + fetching pkg:build2.org/rep-fetch/bar/stable (complements pkg:build2.org/rep-fetch/bar/testing) 5 package(s) in 5 repository(s) EOE $rep_list >>"EOO" - bpkg:build2.org/rep-fetch/bar/unstable ($rep/bar/unstable) - complement bpkg:build2.org/rep-fetch/bar/testing ($rep/bar/testing) - complement bpkg:build2.org/rep-fetch/bar/stable ($rep/bar/stable) - prerequisite bpkg:build2.org/rep-fetch/foo/stable ($rep/foo/stable) - prerequisite bpkg:build2.org/rep-fetch/foo/testing ($rep/foo/testing) - complement bpkg:build2.org/rep-fetch/foo/stable ($rep/foo/stable) - prerequisite bpkg:build2.org/rep-fetch/foo/testing ($rep/foo/testing) - complement bpkg:build2.org/rep-fetch/foo/stable ($rep/foo/stable) + pkg:build2.org/rep-fetch/bar/unstable ($rep/bar/unstable) + complement pkg:build2.org/rep-fetch/bar/testing ($rep/bar/testing) + complement pkg:build2.org/rep-fetch/bar/stable ($rep/bar/stable) + prerequisite pkg:build2.org/rep-fetch/foo/stable ($rep/foo/stable) + prerequisite pkg:build2.org/rep-fetch/foo/testing ($rep/foo/testing) + complement pkg:build2.org/rep-fetch/foo/stable ($rep/foo/stable) + prerequisite pkg:build2.org/rep-fetch/foo/testing ($rep/foo/testing) + complement pkg:build2.org/rep-fetch/foo/stable ($rep/foo/stable) EOO } @@ -225,18 +225,18 @@ $* 2>>/EOE != 0 $clone_root_cfg; $* --trust-yes $rep/cycle/stable 2>>EOE; - added bpkg:build2.org/rep-fetch/cycle/stable - fetching bpkg:build2.org/rep-fetch/cycle/stable - fetching bpkg:build2.org/rep-fetch/cycle/math (prerequisite of bpkg:build2.org/rep-fetch/cycle/stable) - fetching bpkg:build2.org/rep-fetch/cycle/extra (prerequisite of bpkg:build2.org/rep-fetch/cycle/math) + added pkg:build2.org/rep-fetch/cycle/stable + fetching pkg:build2.org/rep-fetch/cycle/stable + fetching pkg:build2.org/rep-fetch/cycle/math (prerequisite of pkg:build2.org/rep-fetch/cycle/stable) + fetching pkg:build2.org/rep-fetch/cycle/extra (prerequisite of pkg:build2.org/rep-fetch/cycle/math) 3 package(s) in 3 repository(s) EOE $rep_list >>"EOO" - bpkg:build2.org/rep-fetch/cycle/stable ($rep/cycle/stable) - prerequisite bpkg:build2.org/rep-fetch/cycle/math ($rep/cycle/math) - prerequisite bpkg:build2.org/rep-fetch/cycle/extra ($rep/cycle/extra) - prerequisite bpkg:build2.org/rep-fetch/cycle/stable ($rep/cycle/stable) + pkg:build2.org/rep-fetch/cycle/stable ($rep/cycle/stable) + prerequisite pkg:build2.org/rep-fetch/cycle/math ($rep/cycle/math) + prerequisite pkg:build2.org/rep-fetch/cycle/extra ($rep/cycle/extra) + prerequisite pkg:build2.org/rep-fetch/cycle/stable ($rep/cycle/stable) EOO } @@ -266,23 +266,23 @@ $* 2>>/EOE != 0 $clone_cfg; $* --trust-yes $rep/cycle/stable 2>>EOE; - added bpkg:build2.org/rep-fetch/cycle/stable - fetching bpkg:build2.org/rep-fetch/cycle/stable - fetching bpkg:build2.org/rep-fetch/cycle/math (prerequisite of bpkg:build2.org/rep-fetch/cycle/stable) - fetching bpkg:build2.org/rep-fetch/cycle/extra (prerequisite of bpkg:build2.org/rep-fetch/cycle/math) + added pkg:build2.org/rep-fetch/cycle/stable + fetching pkg:build2.org/rep-fetch/cycle/stable + fetching pkg:build2.org/rep-fetch/cycle/math (prerequisite of pkg:build2.org/rep-fetch/cycle/stable) + fetching pkg:build2.org/rep-fetch/cycle/extra (prerequisite of pkg:build2.org/rep-fetch/cycle/math) 3 package(s) in 3 repository(s) EOE $* --trust-yes $stable_rep 2>>EOE; - updated bpkg:build2.org/rep-fetch/cycle/stable - fetching bpkg:build2.org/rep-fetch/cycle/stable - fetching bpkg:build2.org/rep-fetch/cycle/extra (prerequisite of bpkg:build2.org/rep-fetch/cycle/stable) + updated pkg:build2.org/rep-fetch/cycle/stable + fetching pkg:build2.org/rep-fetch/cycle/stable + fetching pkg:build2.org/rep-fetch/cycle/extra (prerequisite of pkg:build2.org/rep-fetch/cycle/stable) 2 package(s) in 2 repository(s) EOE $rep_list >>"EOO" - bpkg:build2.org/rep-fetch/cycle/stable ($nc_rep/stable) - prerequisite bpkg:build2.org/rep-fetch/cycle/extra ($nc_rep/extra) + pkg:build2.org/rep-fetch/cycle/stable ($nc_rep/stable) + prerequisite pkg:build2.org/rep-fetch/cycle/extra ($nc_rep/extra) EOO } @@ -292,26 +292,26 @@ $* 2>>/EOE != 0 $clone_cfg; $* --trust-yes $rep/cycle/stable 2>>EOE; - added bpkg:build2.org/rep-fetch/cycle/stable - fetching bpkg:build2.org/rep-fetch/cycle/stable - fetching bpkg:build2.org/rep-fetch/cycle/math (prerequisite of bpkg:build2.org/rep-fetch/cycle/stable) - fetching bpkg:build2.org/rep-fetch/cycle/extra (prerequisite of bpkg:build2.org/rep-fetch/cycle/math) + added pkg:build2.org/rep-fetch/cycle/stable + fetching pkg:build2.org/rep-fetch/cycle/stable + fetching pkg:build2.org/rep-fetch/cycle/math (prerequisite of pkg:build2.org/rep-fetch/cycle/stable) + fetching pkg:build2.org/rep-fetch/cycle/extra (prerequisite of pkg:build2.org/rep-fetch/cycle/math) 3 package(s) in 3 repository(s) EOE $* --trust-yes $math_rep $stable_rep 2>>EOE; - added bpkg:build2.org/rep-fetch/cycle/math - updated bpkg:build2.org/rep-fetch/cycle/stable - fetching bpkg:build2.org/rep-fetch/cycle/math - fetching bpkg:build2.org/rep-fetch/cycle/stable - fetching bpkg:build2.org/rep-fetch/cycle/extra (prerequisite of bpkg:build2.org/rep-fetch/cycle/stable) + added pkg:build2.org/rep-fetch/cycle/math + updated pkg:build2.org/rep-fetch/cycle/stable + fetching pkg:build2.org/rep-fetch/cycle/math + fetching pkg:build2.org/rep-fetch/cycle/stable + fetching pkg:build2.org/rep-fetch/cycle/extra (prerequisite of pkg:build2.org/rep-fetch/cycle/stable) 3 package(s) in 3 repository(s) EOE $rep_list >>"EOO" - bpkg:build2.org/rep-fetch/cycle/math ($nc_rep/math) - bpkg:build2.org/rep-fetch/cycle/stable ($nc_rep/stable) - prerequisite bpkg:build2.org/rep-fetch/cycle/extra ($nc_rep/extra) + pkg:build2.org/rep-fetch/cycle/math ($nc_rep/math) + pkg:build2.org/rep-fetch/cycle/stable ($nc_rep/stable) + prerequisite pkg:build2.org/rep-fetch/cycle/extra ($nc_rep/extra) EOO } } diff --git a/tests/rep-info.test b/tests/rep-info.test index ce0c6d4..2b6aa0f 100644 --- a/tests/rep-info.test +++ b/tests/rep-info.test @@ -52,9 +52,9 @@ EOE : unsigned : $* $rep/testing >>"EOO" - bpkg:build2.org/rep-info/testing ($rep/testing) - prerequisite bpkg:build2.org/foo/testing ($rep_root/foo/testing) - complement bpkg:build2.org/rep-info/stable ($rep/stable) + pkg:build2.org/rep-info/testing ($rep/testing) + prerequisite pkg:build2.org/foo/testing ($rep_root/foo/testing) + complement pkg:build2.org/rep-info/stable ($rep/stable) foo/1 EOO @@ -62,11 +62,11 @@ EOE : signed : $* $rep/signed >>"EOO" - bpkg:build2.org/rep-info/signed ($rep/signed) + pkg:build2.org/rep-info/signed ($rep/signed) CN=build2.org/O=Code Synthesis/info@build2.org $cert_fp - prerequisite bpkg:build2.org/foo/testing ($rep_root/foo/testing) - complement bpkg:build2.org/rep-info/stable ($rep/stable) + prerequisite pkg:build2.org/foo/testing ($rep_root/foo/testing) + complement pkg:build2.org/rep-info/stable ($rep/stable) foo/1 EOO @@ -74,7 +74,7 @@ EOE : name : -$* --name $rep/testing >"bpkg:build2.org/rep-info/testing ($rep/testing)" +$* --name $rep/testing >"pkg:build2.org/rep-info/testing ($rep/testing)" : packages : @@ -107,8 +107,8 @@ $* --name $rep/testing >"bpkg:build2.org/rep-info/testing ($rep/testing)" : list : $* --repositories $rep/testing >>"EOO" - prerequisite bpkg:build2.org/foo/testing ($rep_root/foo/testing) - complement bpkg:build2.org/rep-info/stable ($rep/stable) + prerequisite pkg:build2.org/foo/testing ($rep_root/foo/testing) + complement pkg:build2.org/rep-info/stable ($rep/stable) EOO : manifest @@ -116,10 +116,10 @@ $* --name $rep/testing >"bpkg:build2.org/rep-info/testing ($rep/testing)" $* --repositories --manifest $rep/testing >>EOO : 1 location: ../../foo/testing - type: bpkg + type: pkg : location: ../stable - type: bpkg + type: pkg role: complement : EOO diff --git a/tests/rep-list.test b/tests/rep-list.test index a8802ea..398d887 100644 --- a/tests/rep-list.test +++ b/tests/rep-list.test @@ -64,8 +64,8 @@ rep_fetch += -d cfg --auth all --trust-yes 2>! $rep_add $rep/stable && $rep_add $rep/testing && $rep_fetch; $* >>"EOO" - bpkg:build2.org/rep-list/stable ($rep/stable) - bpkg:build2.org/rep-list/testing ($rep/testing) + pkg:build2.org/rep-list/stable ($rep/stable) + pkg:build2.org/rep-list/testing ($rep/testing) EOO } @@ -78,10 +78,10 @@ rep_fetch += -d cfg --auth all --trust-yes 2>! $rep_add $rep/stable && $rep_fetch; $* --prerequisites >>"EOO" - bpkg:build2.org/rep-list/stable ($rep/stable) - prerequisite bpkg:build2.org/rep-list/math ($rep/math) - prerequisite bpkg:build2.org/rep-list/extra ($rep/extra) - prerequisite bpkg:build2.org/rep-list/stable ($rep/stable) + pkg:build2.org/rep-list/stable ($rep/stable) + prerequisite pkg:build2.org/rep-list/math ($rep/math) + prerequisite pkg:build2.org/rep-list/extra ($rep/extra) + prerequisite pkg:build2.org/rep-list/stable ($rep/stable) EOO } @@ -92,8 +92,8 @@ rep_fetch += -d cfg --auth all --trust-yes 2>! $rep_add $rep/testing && $rep_fetch; $* --complements >>"EOO" - bpkg:build2.org/rep-list/testing ($rep/testing) - complement bpkg:build2.org/rep-list/stable ($rep/stable) + pkg:build2.org/rep-list/testing ($rep/testing) + complement pkg:build2.org/rep-list/stable ($rep/stable) EOO } @@ -104,15 +104,15 @@ rep_fetch += -d cfg --auth all --trust-yes 2>! $rep_add $rep/testing && $rep_fetch; $* --prerequisites --complements >>"EOO" - bpkg:build2.org/rep-list/testing ($rep/testing) - complement bpkg:build2.org/rep-list/stable ($rep/stable) - prerequisite bpkg:build2.org/rep-list/math ($rep/math) - prerequisite bpkg:build2.org/rep-list/extra ($rep/extra) - prerequisite bpkg:build2.org/rep-list/stable ($rep/stable) - prerequisite bpkg:build2.org/rep-list/extra ($rep/extra) - prerequisite bpkg:build2.org/rep-list/stable ($rep/stable) - prerequisite bpkg:build2.org/rep-list/math ($rep/math) - prerequisite bpkg:build2.org/rep-list/extra ($rep/extra) + pkg:build2.org/rep-list/testing ($rep/testing) + complement pkg:build2.org/rep-list/stable ($rep/stable) + prerequisite pkg:build2.org/rep-list/math ($rep/math) + prerequisite pkg:build2.org/rep-list/extra ($rep/extra) + prerequisite pkg:build2.org/rep-list/stable ($rep/stable) + prerequisite pkg:build2.org/rep-list/extra ($rep/extra) + prerequisite pkg:build2.org/rep-list/stable ($rep/stable) + prerequisite pkg:build2.org/rep-list/math ($rep/math) + prerequisite pkg:build2.org/rep-list/extra ($rep/extra) EOO } diff --git a/tests/rep-remove.test b/tests/rep-remove.test index 3717449..e451def 100644 --- a/tests/rep-remove.test +++ b/tests/rep-remove.test @@ -90,11 +90,11 @@ pkg_status += -d cfg $rep_add $rep/extra && $rep_fetch; $* --clean 2>>"EOE"; - cleaned bpkg:build2.org/rep-remove/extra + cleaned pkg:build2.org/rep-remove/extra EOE $rep_list >>"EOE"; - bpkg:build2.org/rep-remove/extra ($rep/extra) + pkg:build2.org/rep-remove/extra ($rep/extra) EOE $pkg_status libbar >'unknown' @@ -107,7 +107,7 @@ pkg_status += -d cfg $rep_add $rep/extra && $rep_fetch; $* --all 2>>"EOE"; - removed bpkg:build2.org/rep-remove/extra + removed pkg:build2.org/rep-remove/extra EOE $rep_list >:""; @@ -120,8 +120,8 @@ pkg_status += -d cfg $clone_cfg; $rep_add $rep/extra && $rep_fetch; - $* 'bpkg:build2.org/rep-remove/extra' 2>>"EOE"; - removed bpkg:build2.org/rep-remove/extra + $* 'pkg:build2.org/rep-remove/extra' 2>>"EOE"; + removed pkg:build2.org/rep-remove/extra EOE $rep_list >:""; @@ -135,7 +135,7 @@ pkg_status += -d cfg $rep_add $rep/testing && $rep_fetch; $* $rep/testing 2>>"EOE"; - removed bpkg:build2.org/rep-remove/testing + removed pkg:build2.org/rep-remove/testing EOE $rep_list >:""; @@ -150,14 +150,14 @@ pkg_status += -d cfg $rep_add $rep/testing && $rep_add $rep/math && $rep_fetch; $* $rep/testing 2>>"EOE"; - removed bpkg:build2.org/rep-remove/testing + removed pkg:build2.org/rep-remove/testing EOE $rep_list >>"EOO"; - bpkg:build2.org/rep-remove/math ($rep/math) - prerequisite bpkg:build2.org/rep-remove/extra ($rep/extra) - prerequisite bpkg:build2.org/rep-remove/stable ($rep/stable) - prerequisite bpkg:build2.org/rep-remove/math ($rep/math) + pkg:build2.org/rep-remove/math ($rep/math) + prerequisite pkg:build2.org/rep-remove/extra ($rep/extra) + prerequisite pkg:build2.org/rep-remove/stable ($rep/stable) + prerequisite pkg:build2.org/rep-remove/math ($rep/math) EOO $pkg_status libbar >'available 1.0.0 sys:?'; |