diff options
Diffstat (limited to 'test')
| -rw-r--r-- | test/add | 4 | ||||
| -rwxr-xr-x | test/main | 14 | ||||
| -rw-r--r-- | test/remove | 4 | ||||
| -rw-r--r-- | test/setup | 4 |
4 files changed, 13 insertions, 13 deletions
@@ -14,8 +14,8 @@ echo "# populate_collected" repeat 2 { echo "# pkg list" - stringcmp "core\n$repo" "$(pkg list local)" + stringcmp "pkg\n$repo" "$(pkg list local)" stringcmp "$complement\nrb\nrb-bare\nrc\nrc-bare" "$(pkg list not-installed)" - stringcmp "core\nra\nra-bare\nrb\nrb-bare\nrc\nrc-bare" "$(pkg list remote)" + stringcmp "pkg\nra\nra-bare\nrb\nrb-bare\nrc\nrc-bare" "$(pkg list remote)" pkg update } @@ -31,12 +31,12 @@ source $tests/checklinks (source $tests/setup) echo "# bootstrapping PKG_DIR" -$test_proot/core/include/bootstrap $test_proot $test_pdir +$test_proot/pkg/include/bootstrap $test_proot $test_pdir echo "# checking for success" [[ -e $test_home/.config/pkg/pkg.conf ]] -[[ -d $test_proot/core ]] -[[ -d $test_pdir/core ]] +[[ -d $test_proot/pkg ]] +[[ -d $test_pdir/pkg ]] [[ -L $test_home/bin/pkg ]] [[ -L $test_home/bin/checklinks ]] [[ -x $(readlink $test_home/bin/pkg) ]] @@ -46,20 +46,20 @@ echo "# checking for success" [[ -e $test_pdir/.collected/man/man7/pkg.7 ]] echo "# pkg list local" -stringcmp "core" "$(pkg list)" -stringcmp "core" "$(pkg list local)" +stringcmp "pkg" "$(pkg list)" +stringcmp "pkg" "$(pkg list local)" echo "# pkg list not-installed" stringcmp "ra\nra-bare\nrb\nrb-bare\nrc\nrc-bare" "$(pkg list not-installed)" echo "# pkg list all" -stringcmp "core\nra\nra-bare\nrb\nrb-bare\nrc\nrc-bare" "$(pkg list all)" +stringcmp "pkg\nra\nra-bare\nrb\nrb-bare\nrc\nrc-bare" "$(pkg list all)" echo "# pkg add (no such repo)" ! pkg add weltfrieden echo "# pkg add (already installed)" -! pkg add core +! pkg add pkg for conf_origin in 0 1; { echo "## GIT_USE_ORIGIN=$conf_origin" diff --git a/test/remove b/test/remove index c22a4f3..e850ec0 100644 --- a/test/remove +++ b/test/remove @@ -12,8 +12,8 @@ echo "# genocide_collected (~/bin)" repeat 2 { echo "# pkg list" - stringcmp "core" "$(pkg list local)" + stringcmp "pkg" "$(pkg list local)" stringcmp "ra\nra-bare\nrb\nrb-bare\nrc\nrc-bare" "$(pkg list not-installed)" - stringcmp "core\nra\nra-bare\nrb\nrb-bare\nrc\nrc-bare" "$(pkg list remote)" + stringcmp "pkg\nra\nra-bare\nrb\nrb-bare\nrc\nrc-bare" "$(pkg list remote)" pkg update } @@ -1,8 +1,8 @@ ## vim:ft=zsh echo "# setting up PKG_ROOT" cd $test_proot -git clone --quiet ${1-git://git.tabularazor.org/~derf/pkg} core -cp core/include/pkglist pkglist +git clone --quiet ${1-git://git.tabularazor.org/~derf/pkg} pkg +cp pkg/include/pkglist pkglist for repo in ra rb rc; ( mkdir $repo cd $repo |