diff options
| -rw-r--r-- | bpkg/utility.cxx | 8 | ||||
| -rw-r--r-- | tests/pkg-build.test | 4 | ||||
| -rw-r--r-- | tests/pkg-checkout.test | 2 | ||||
| -rw-r--r-- | tests/pkg-clean.test | 2 | ||||
| -rw-r--r-- | tests/pkg-configure.test | 2 | ||||
| -rw-r--r-- | tests/pkg-fetch.test | 2 | ||||
| -rw-r--r-- | tests/pkg-status.test | 2 | ||||
| -rw-r--r-- | tests/pkg-unpack.test | 2 | ||||
| -rw-r--r-- | tests/pkg-update.test | 2 | ||||
| -rw-r--r-- | tests/rep-auth.test | 4 | ||||
| -rw-r--r-- | tests/rep-fetch-git-branch.test | 4 | ||||
| -rw-r--r-- | tests/rep-fetch-git.test | 2 | ||||
| -rw-r--r-- | tests/rep-fetch.test | 8 | ||||
| -rw-r--r-- | tests/rep-list.test | 2 |
14 files changed, 25 insertions, 21 deletions
diff --git a/bpkg/utility.cxx b/bpkg/utility.cxx index d80e55e..652cd46 100644 --- a/bpkg/utility.cxx +++ b/bpkg/utility.cxx @@ -22,8 +22,12 @@ namespace bpkg const dir_path empty_dir_path; const dir_path bpkg_dir (".bpkg"); - const dir_path certs_dir (dir_path (bpkg_dir) /= "certificates"); - const dir_path repos_dir (dir_path (bpkg_dir) /= "repositories"); + + // Keep these directory names short, lowering the probability of hitting the + // path length limit on Windows. + // + const dir_path certs_dir (dir_path (bpkg_dir) /= "certs"); + const dir_path repos_dir (dir_path (bpkg_dir) /= "repos"); const dir_path current_dir ("."); diff --git a/tests/pkg-build.test b/tests/pkg-build.test index d0f9787..b7d7fff 100644 --- a/tests/pkg-build.test +++ b/tests/pkg-build.test @@ -1472,7 +1472,7 @@ else $clone_root_cfg; $rep_add "$rep0/libbar.git#master"; $rep_add "$rep0/style-basic.git#master"; - $rep_fetch &cfg/.bpkg/repositories/*/***; + $rep_fetch &cfg/.bpkg/repos/*/***; $* libmbar 2>>~%EOE%; %dist style-basic-.+% @@ -1500,7 +1500,7 @@ else $clone_root_cfg; $rep_add "$rep1/libbaz.git#master"; $rep_add "$rep0/style-basic.git#master"; - $rep_fetch &cfg/.bpkg/repositories/*/***; + $rep_fetch &cfg/.bpkg/repos/*/***; $* libbaz 2>>~%EOE%; %dist style-basic-.+% diff --git a/tests/pkg-checkout.test b/tests/pkg-checkout.test index a50c0f7..ec750e6 100644 --- a/tests/pkg-checkout.test +++ b/tests/pkg-checkout.test @@ -39,7 +39,7 @@ else pkg_purge += -d cfg 2>! pkg_status += -d cfg - test.cleanups += &cfg/.bpkg/repositories/*/*** + test.cleanups += &cfg/.bpkg/repos/*/*** : unconfigured-dependency : diff --git a/tests/pkg-clean.test b/tests/pkg-clean.test index 6f393af..64e7931 100644 --- a/tests/pkg-clean.test +++ b/tests/pkg-clean.test @@ -68,7 +68,7 @@ $* 2>>EOE != 0 { +$clone_cfg +$rep_add $rep/hello - +$rep_fetch --trust $cert_fp &cfg/.bpkg/certificates/** + +$rep_fetch --trust $cert_fp &cfg/.bpkg/certs/** : no-such-package : diff --git a/tests/pkg-configure.test b/tests/pkg-configure.test index 4253cf5..6e320e9 100644 --- a/tests/pkg-configure.test +++ b/tests/pkg-configure.test @@ -102,7 +102,7 @@ $* libhello libhello 2>>EOE != 0 { +$clone_cfg +$rep_add $rep/hello - +$rep_fetch --trust $cert_fp &cfg/.bpkg/certificates/** + +$rep_fetch --trust $cert_fp &cfg/.bpkg/certs/** : no-such-package : diff --git a/tests/pkg-fetch.test b/tests/pkg-fetch.test index 6ee2043..34d3397 100644 --- a/tests/pkg-fetch.test +++ b/tests/pkg-fetch.test @@ -188,7 +188,7 @@ $* libfoo/1.0.0 2>>/EOE != 0 { $clone_cfg; $rep_add $rep/hello; - $rep_fetch --trust $cert_fp &cfg/.bpkg/certificates/**; + $rep_fetch --trust $cert_fp &cfg/.bpkg/certs/**; $* libhello/1.0.0 2>>~%EOE%; %.* diff --git a/tests/pkg-status.test b/tests/pkg-status.test index 9a72784..dbdc97e 100644 --- a/tests/pkg-status.test +++ b/tests/pkg-status.test @@ -183,7 +183,7 @@ if ($git_supported != true) else { rep = "$rep_git/state0" - test.cleanups += &cfg/.bpkg/repositories/*/*** + test.cleanups += &cfg/.bpkg/repos/*/*** : complement-cycle : diff --git a/tests/pkg-unpack.test b/tests/pkg-unpack.test index 236744f..0ba249f 100644 --- a/tests/pkg-unpack.test +++ b/tests/pkg-unpack.test @@ -185,7 +185,7 @@ $* 2>>EOE != 0 : { $clone_cfg; - $rep_add $rep/hello && $rep_fetch --trust $cert_fp &cfg/.bpkg/certificates/**; + $rep_add $rep/hello && $rep_fetch --trust $cert_fp &cfg/.bpkg/certs/**; $pkg_fetch libhello/1.0.0; $* libhello 2>'unpacked libhello/1.0.0'; diff --git a/tests/pkg-update.test b/tests/pkg-update.test index 2d82934..d2e28ef 100644 --- a/tests/pkg-update.test +++ b/tests/pkg-update.test @@ -72,7 +72,7 @@ $* 2>>EOE != 0 { +$clone_cfg +$rep_add $rep/hello - +$rep_fetch --trust $cert_fp &cfg/.bpkg/certificates/** + +$rep_fetch --trust $cert_fp &cfg/.bpkg/certs/** : no-such-package : diff --git a/tests/rep-auth.test b/tests/rep-auth.test index b0c28cf..336397b 100644 --- a/tests/rep-auth.test +++ b/tests/rep-auth.test @@ -165,7 +165,7 @@ sc = " " # Space character to append to here-document line when required. : { +$clone_root_cfg && $rep_add $rep/signed - rep_fetch += --auth all &?cfg/.bpkg/certificates/** + rep_fetch += --auth all &?cfg/.bpkg/certs/** : no-auth : @@ -312,7 +312,7 @@ sc = " " # Space character to append to here-document line when required. $clone_root_cfg; rep_info += -d cfg; - $rep_info --trust "$cert_fp" &cfg/.bpkg/certificates/** >>EOO; + $rep_info --trust "$cert_fp" &cfg/.bpkg/certs/** >>EOO; name:build2.org EOO diff --git a/tests/rep-fetch-git-branch.test b/tests/rep-fetch-git-branch.test index 61699bb..dfc9633 100644 --- a/tests/rep-fetch-git-branch.test +++ b/tests/rep-fetch-git-branch.test @@ -62,7 +62,7 @@ warning: fetching over dumb HTTP, no progress will be shown' : fetch : { - : unchanged + : same : { $clone_root_cfg && $rep_add "$rep/state0/libfoo.git#$branch"; @@ -99,7 +99,7 @@ warning: fetching over dumb HTTP, no progress will be shown' # Cloning into 'cfg\.bpkg\tmp\f9be881264703b5d\master'... # $* 2>&1 | sed -n -e "s/Cloning into '\(.+$branch\)'\.{3}/\$1/p" | \ - sed -n -e 's%(.+[\\/])tmp([\\/].+)%$1repositories$2%p' | \ + sed -n -e 's%(.+[\\/])tmp([\\/].+)%$1repos$2%p' | \ set r; $g "$r" config remote.origin.url "$u/libfoo.git"; diff --git a/tests/rep-fetch-git.test b/tests/rep-fetch-git.test index 0d512eb..1dbea3f 100644 --- a/tests/rep-fetch-git.test +++ b/tests/rep-fetch-git.test @@ -6,7 +6,7 @@ # the final states. See tests/common/git/init script for more details. # -test.cleanups += &cfg/.bpkg/repositories/*/*** +test.cleanups += &cfg/.bpkg/repos/*/*** +if ($git_protocol == 'local') rep = "$rep_git_local" diff --git a/tests/rep-fetch.test b/tests/rep-fetch.test index b0d73bd..527a07b 100644 --- a/tests/rep-fetch.test +++ b/tests/rep-fetch.test @@ -122,7 +122,7 @@ $* 2>>/EOE != 0 { $clone_root_cfg && $rep_add $rep/hello; - $* --trust $cert_fp 2>>EOE &cfg/.bpkg/certificates/**; + $* --trust $cert_fp 2>>EOE &cfg/.bpkg/certs/**; fetching bpkg:build2.org/rep-fetch/hello 1 package(s) in 1 repository(s) EOE @@ -162,7 +162,7 @@ $* 2>>/EOE != 0 { $clone_root_cfg && $rep_add $rep/hello $rep/bar/unstable; - $* --trust-yes 2>>EOE &cfg/.bpkg/certificates/**; + $* --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) @@ -372,7 +372,7 @@ else if ($remote == true) { $clone_root_cfg && $rep_add "$rep_git_git/state0/libfoo.git#master"; - $* 2>! &cfg/.bpkg/repositories/*/***; + $* 2>! &cfg/.bpkg/repos/*/***; $rep_add "$rep_git_https_smart_unadv/state0/libfoo.git#master"; $* 2>>~"%EOE%" @@ -399,7 +399,7 @@ else # Cloning into 'cfg\.bpkg\tmp\f9be881264703b5d\master'... # $* 2>&1 | sed -n -e "s/Cloning into '\(.+master\)'\.{3}/\$1/p" | \ - sed -n -e 's%(.+[\\/])tmp([\\/].+)%$1repositories$2%p' | \ + sed -n -e 's%(.+[\\/])tmp([\\/].+)%$1repos$2%p' | \ set r; # Break the repo (drop the remote repository URL) and try to re-fetch. diff --git a/tests/rep-list.test b/tests/rep-list.test index aea7d84..a8802ea 100644 --- a/tests/rep-list.test +++ b/tests/rep-list.test @@ -126,7 +126,7 @@ if ($git_supported != true) else { rep = "$rep_git/state0" - test.cleanups += &cfg/.bpkg/repositories/*/*** + test.cleanups += &cfg/.bpkg/repos/*/*** : root-complement : |