From 21758878a3b902ba06aaf2945edc626b367f2dbd Mon Sep 17 00:00:00 2001 From: Boris Kolpackov Date: Mon, 12 Oct 2015 12:18:49 +0200 Subject: Rework test script --- .../1/common/bar/stable/libbar-1.0.0.tar.gz | Bin 0 -> 957 bytes tests/repository/1/common/bar/stable/repositories | 6 + .../1/common/bar/testing/libbar-1.1.0.tar.gz | Bin 0 -> 959 bytes tests/repository/1/common/bar/testing/repositories | 8 + .../1/common/bar/unstable/libbar-1.1.1.tar.gz | Bin 0 -> 960 bytes .../repository/1/common/bar/unstable/repositories | 8 + .../1/common/foo/stable/libfoo-1.0.0.tar.gz | Bin 0 -> 881 bytes tests/repository/1/common/foo/stable/repositories | 3 + .../1/common/foo/testing/libfoo-1.1.0.tar.gz | Bin 0 -> 874 bytes tests/repository/1/common/foo/testing/repositories | 6 + .../1/common/hello/libhello-1.0.0.tar.gz | Bin 0 -> 1441 bytes tests/repository/1/common/hello/repositories | 4 + .../1/common/libhello-1.0.0/build/bootstrap.build | 8 + .../1/common/libhello-1.0.0/build/export.build | 6 + .../1/common/libhello-1.0.0/build/root.build | 10 + tests/repository/1/common/libhello-1.0.0/buildfile | 3 + .../1/common/libhello-1.0.0/hello/buildfile | 8 + .../repository/1/common/libhello-1.0.0/hello/hello | 12 + .../1/common/libhello-1.0.0/hello/hello.cxx | 16 + tests/repository/1/common/libhello-1.0.0/manifest | 10 + .../libhello-1.0.0/tests/build/bootstrap.build | 4 + .../1/common/libhello-1.0.0/tests/build/root.build | 10 + .../1/common/libhello-1.0.0/tests/buildfile | 3 + .../1/common/libhello-1.0.0/tests/test/buildfile | 4 + .../1/common/libhello-1.0.0/tests/test/driver.cxx | 11 + .../1/common/libhello-1.0.0/tests/test/test.out | 1 + tests/repository/1/common/libhello-1.0.0/version | 1 + tests/repository/1/math/stable/repositories | 6 - tests/repository/1/math/testing/repositories | 8 - tests/repository/1/math/unstable/repositories | 8 - .../1/misc/stable/libhello-1.0.0.tar.bz2 | Bin 1367 -> 0 bytes tests/repository/1/misc/stable/repositories | 3 - .../1/misc/testing/libhello-1.0.0-1.tar.bz2 | Bin 1368 -> 0 bytes tests/repository/1/misc/testing/repositories | 6 - tests/repository/publish.sh | 10 + tests/test.sh | 561 +++++++++++---------- 36 files changed, 449 insertions(+), 295 deletions(-) create mode 100644 tests/repository/1/common/bar/stable/libbar-1.0.0.tar.gz create mode 100644 tests/repository/1/common/bar/stable/repositories create mode 100644 tests/repository/1/common/bar/testing/libbar-1.1.0.tar.gz create mode 100644 tests/repository/1/common/bar/testing/repositories create mode 100644 tests/repository/1/common/bar/unstable/libbar-1.1.1.tar.gz create mode 100644 tests/repository/1/common/bar/unstable/repositories create mode 100644 tests/repository/1/common/foo/stable/libfoo-1.0.0.tar.gz create mode 100644 tests/repository/1/common/foo/stable/repositories create mode 100644 tests/repository/1/common/foo/testing/libfoo-1.1.0.tar.gz create mode 100644 tests/repository/1/common/foo/testing/repositories create mode 100644 tests/repository/1/common/hello/libhello-1.0.0.tar.gz create mode 100644 tests/repository/1/common/hello/repositories create mode 100644 tests/repository/1/common/libhello-1.0.0/build/bootstrap.build create mode 100644 tests/repository/1/common/libhello-1.0.0/build/export.build create mode 100644 tests/repository/1/common/libhello-1.0.0/build/root.build create mode 100644 tests/repository/1/common/libhello-1.0.0/buildfile create mode 100644 tests/repository/1/common/libhello-1.0.0/hello/buildfile create mode 100644 tests/repository/1/common/libhello-1.0.0/hello/hello create mode 100644 tests/repository/1/common/libhello-1.0.0/hello/hello.cxx create mode 100644 tests/repository/1/common/libhello-1.0.0/manifest create mode 100644 tests/repository/1/common/libhello-1.0.0/tests/build/bootstrap.build create mode 100644 tests/repository/1/common/libhello-1.0.0/tests/build/root.build create mode 100644 tests/repository/1/common/libhello-1.0.0/tests/buildfile create mode 100644 tests/repository/1/common/libhello-1.0.0/tests/test/buildfile create mode 100644 tests/repository/1/common/libhello-1.0.0/tests/test/driver.cxx create mode 100644 tests/repository/1/common/libhello-1.0.0/tests/test/test.out create mode 100644 tests/repository/1/common/libhello-1.0.0/version delete mode 100644 tests/repository/1/math/stable/repositories delete mode 100644 tests/repository/1/math/testing/repositories delete mode 100644 tests/repository/1/math/unstable/repositories delete mode 100644 tests/repository/1/misc/stable/libhello-1.0.0.tar.bz2 delete mode 100644 tests/repository/1/misc/stable/repositories delete mode 100644 tests/repository/1/misc/testing/libhello-1.0.0-1.tar.bz2 delete mode 100644 tests/repository/1/misc/testing/repositories create mode 100755 tests/repository/publish.sh diff --git a/tests/repository/1/common/bar/stable/libbar-1.0.0.tar.gz b/tests/repository/1/common/bar/stable/libbar-1.0.0.tar.gz new file mode 100644 index 0000000..d77c1ba Binary files /dev/null and b/tests/repository/1/common/bar/stable/libbar-1.0.0.tar.gz differ diff --git a/tests/repository/1/common/bar/stable/repositories b/tests/repository/1/common/bar/stable/repositories new file mode 100644 index 0000000..b8ecc1f --- /dev/null +++ b/tests/repository/1/common/bar/stable/repositories @@ -0,0 +1,6 @@ +# bar/stable +# +: 1 +location: ../../foo/stable +: + diff --git a/tests/repository/1/common/bar/testing/libbar-1.1.0.tar.gz b/tests/repository/1/common/bar/testing/libbar-1.1.0.tar.gz new file mode 100644 index 0000000..f081804 Binary files /dev/null and b/tests/repository/1/common/bar/testing/libbar-1.1.0.tar.gz differ diff --git a/tests/repository/1/common/bar/testing/repositories b/tests/repository/1/common/bar/testing/repositories new file mode 100644 index 0000000..5ab8cba --- /dev/null +++ b/tests/repository/1/common/bar/testing/repositories @@ -0,0 +1,8 @@ +# bar/testing +# +: 1 +location: ../../foo/testing +: +location: ../stable +role: complement +: diff --git a/tests/repository/1/common/bar/unstable/libbar-1.1.1.tar.gz b/tests/repository/1/common/bar/unstable/libbar-1.1.1.tar.gz new file mode 100644 index 0000000..889dc90 Binary files /dev/null and b/tests/repository/1/common/bar/unstable/libbar-1.1.1.tar.gz differ diff --git a/tests/repository/1/common/bar/unstable/repositories b/tests/repository/1/common/bar/unstable/repositories new file mode 100644 index 0000000..d4ddcf5 --- /dev/null +++ b/tests/repository/1/common/bar/unstable/repositories @@ -0,0 +1,8 @@ +# bar/unstable +# +: 1 +location: ../../foo/testing +: +location: ../testing +role: complement +: diff --git a/tests/repository/1/common/foo/stable/libfoo-1.0.0.tar.gz b/tests/repository/1/common/foo/stable/libfoo-1.0.0.tar.gz new file mode 100644 index 0000000..c29dd9d Binary files /dev/null and b/tests/repository/1/common/foo/stable/libfoo-1.0.0.tar.gz differ diff --git a/tests/repository/1/common/foo/stable/repositories b/tests/repository/1/common/foo/stable/repositories new file mode 100644 index 0000000..13673fb --- /dev/null +++ b/tests/repository/1/common/foo/stable/repositories @@ -0,0 +1,3 @@ +# foo/stable +# +: 1 diff --git a/tests/repository/1/common/foo/testing/libfoo-1.1.0.tar.gz b/tests/repository/1/common/foo/testing/libfoo-1.1.0.tar.gz new file mode 100644 index 0000000..a6c0202 Binary files /dev/null and b/tests/repository/1/common/foo/testing/libfoo-1.1.0.tar.gz differ diff --git a/tests/repository/1/common/foo/testing/repositories b/tests/repository/1/common/foo/testing/repositories new file mode 100644 index 0000000..cd33f88 --- /dev/null +++ b/tests/repository/1/common/foo/testing/repositories @@ -0,0 +1,6 @@ +# foo/testing +# +: 1 +location: ../stable +role: complement +: diff --git a/tests/repository/1/common/hello/libhello-1.0.0.tar.gz b/tests/repository/1/common/hello/libhello-1.0.0.tar.gz new file mode 100644 index 0000000..7663bab Binary files /dev/null and b/tests/repository/1/common/hello/libhello-1.0.0.tar.gz differ diff --git a/tests/repository/1/common/hello/repositories b/tests/repository/1/common/hello/repositories new file mode 100644 index 0000000..eb30fe1 --- /dev/null +++ b/tests/repository/1/common/hello/repositories @@ -0,0 +1,4 @@ +# Hello World repository. Currently does not have any prerequisite +# repositories. +# +: 1 diff --git a/tests/repository/1/common/libhello-1.0.0/build/bootstrap.build b/tests/repository/1/common/libhello-1.0.0/build/bootstrap.build new file mode 100644 index 0000000..6f7d63b --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/build/bootstrap.build @@ -0,0 +1,8 @@ +project = libhello +version = 1.0.0 +using config +using dist +using test +using install + +dist.package = $project-$version diff --git a/tests/repository/1/common/libhello-1.0.0/build/export.build b/tests/repository/1/common/libhello-1.0.0/build/export.build new file mode 100644 index 0000000..1eb73b7 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/build/export.build @@ -0,0 +1,6 @@ +$out_root/: +{ + include hello/ +} + +export $out_root/hello/lib{hello} diff --git a/tests/repository/1/common/libhello-1.0.0/build/root.build b/tests/repository/1/common/libhello-1.0.0/build/root.build new file mode 100644 index 0000000..7c91ffc --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/build/root.build @@ -0,0 +1,10 @@ +using cxx + +hxx.ext = +cxx.ext = cxx + +cxx.std = 11 + +# Don't try to install tests. +# +tests/: install = false diff --git a/tests/repository/1/common/libhello-1.0.0/buildfile b/tests/repository/1/common/libhello-1.0.0/buildfile new file mode 100644 index 0000000..563ebdc --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/buildfile @@ -0,0 +1,3 @@ +d = hello/ tests/ +.: $d file{version manifest} +include $d diff --git a/tests/repository/1/common/libhello-1.0.0/hello/buildfile b/tests/repository/1/common/libhello-1.0.0/hello/buildfile new file mode 100644 index 0000000..cef703d --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/hello/buildfile @@ -0,0 +1,8 @@ +lib{hello}: cxx{hello} hxx{hello} + +cxx.poptions += -I$src_root +lib{hello}: cxx.export.poptions = -I$src_root + +# Install into the hello/ subdirectory of, say, /usr/include/. +# +install.include = $install.include/hello diff --git a/tests/repository/1/common/libhello-1.0.0/hello/hello b/tests/repository/1/common/libhello-1.0.0/hello/hello new file mode 100644 index 0000000..64c84b8 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/hello/hello @@ -0,0 +1,12 @@ +// file: hello/hello -*- C++ -*- + +#ifndef HELLO_HELLO +#define HELLO_HELLO + +namespace hello +{ + void + say (const char* name); +} + +#endif // HELLO_HELLO diff --git a/tests/repository/1/common/libhello-1.0.0/hello/hello.cxx b/tests/repository/1/common/libhello-1.0.0/hello/hello.cxx new file mode 100644 index 0000000..bba6649 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/hello/hello.cxx @@ -0,0 +1,16 @@ +// file: hello/hello.cxx -*- C++ -*- + +#include + +#include + +using namespace std; + +namespace hello +{ + void + say (const char* n) + { + cout << "Hello, " << n << '!' << endl; + } +} diff --git a/tests/repository/1/common/libhello-1.0.0/manifest b/tests/repository/1/common/libhello-1.0.0/manifest new file mode 100644 index 0000000..065eb38 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/manifest @@ -0,0 +1,10 @@ +: 1 +name: libhello +version: 1.0.0 +summary: The Hello World example library +license: MIT +tags: c++, hello, world, example +description: A simple library that implements the Hello World example in\ + C++. Its primary goal is to show a canonical build2/bpkg project/package. +url: http://www.example.org/libhello +email: hello-users@example.org diff --git a/tests/repository/1/common/libhello-1.0.0/tests/build/bootstrap.build b/tests/repository/1/common/libhello-1.0.0/tests/build/bootstrap.build new file mode 100644 index 0000000..1151b0c --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/tests/build/bootstrap.build @@ -0,0 +1,4 @@ +project = # Unnamed. +using config +using dist +using test diff --git a/tests/repository/1/common/libhello-1.0.0/tests/build/root.build b/tests/repository/1/common/libhello-1.0.0/tests/build/root.build new file mode 100644 index 0000000..37809b8 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/tests/build/root.build @@ -0,0 +1,10 @@ +using cxx + +hxx.ext = +cxx.ext = cxx + +cxx.std = 11 + +# Every exe{} here is by default a test. +# +test.exe = true diff --git a/tests/repository/1/common/libhello-1.0.0/tests/buildfile b/tests/repository/1/common/libhello-1.0.0/tests/buildfile new file mode 100644 index 0000000..7688d2c --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/tests/buildfile @@ -0,0 +1,3 @@ +d = test/ +.: $d +include $d diff --git a/tests/repository/1/common/libhello-1.0.0/tests/test/buildfile b/tests/repository/1/common/libhello-1.0.0/tests/test/buildfile new file mode 100644 index 0000000..a46969d --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/tests/test/buildfile @@ -0,0 +1,4 @@ +import libs = libhello%lib{hello} + +exe{driver}: cxx{driver} $libs +exe{driver}: test.output = test.out diff --git a/tests/repository/1/common/libhello-1.0.0/tests/test/driver.cxx b/tests/repository/1/common/libhello-1.0.0/tests/test/driver.cxx new file mode 100644 index 0000000..59bfb2d --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/tests/test/driver.cxx @@ -0,0 +1,11 @@ +// file: tests/test/driver.cxx -*- C++ -*- + +#include + +int +main () +{ + using hello::say; + + say ("World"); +} diff --git a/tests/repository/1/common/libhello-1.0.0/tests/test/test.out b/tests/repository/1/common/libhello-1.0.0/tests/test/test.out new file mode 100644 index 0000000..8ab686e --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/tests/test/test.out @@ -0,0 +1 @@ +Hello, World! diff --git a/tests/repository/1/common/libhello-1.0.0/version b/tests/repository/1/common/libhello-1.0.0/version new file mode 100644 index 0000000..3eefcb9 --- /dev/null +++ b/tests/repository/1/common/libhello-1.0.0/version @@ -0,0 +1 @@ +1.0.0 diff --git a/tests/repository/1/math/stable/repositories b/tests/repository/1/math/stable/repositories deleted file mode 100644 index c7a30f7..0000000 --- a/tests/repository/1/math/stable/repositories +++ /dev/null @@ -1,6 +0,0 @@ -# math/stable -# -: 1 -location: ../../misc/stable -: - diff --git a/tests/repository/1/math/testing/repositories b/tests/repository/1/math/testing/repositories deleted file mode 100644 index 5210aa4..0000000 --- a/tests/repository/1/math/testing/repositories +++ /dev/null @@ -1,8 +0,0 @@ -# math/testing -# -: 1 -location: ../../misc/testing -: -location: ../stable -role: complement -: diff --git a/tests/repository/1/math/unstable/repositories b/tests/repository/1/math/unstable/repositories deleted file mode 100644 index 4c9d2bf..0000000 --- a/tests/repository/1/math/unstable/repositories +++ /dev/null @@ -1,8 +0,0 @@ -# math/unstable -# -: 1 -location: ../../misc/testing -: -location: ../testing -role: complement -: diff --git a/tests/repository/1/misc/stable/libhello-1.0.0.tar.bz2 b/tests/repository/1/misc/stable/libhello-1.0.0.tar.bz2 deleted file mode 100644 index a8df9b2..0000000 Binary files a/tests/repository/1/misc/stable/libhello-1.0.0.tar.bz2 and /dev/null differ diff --git a/tests/repository/1/misc/stable/repositories b/tests/repository/1/misc/stable/repositories deleted file mode 100644 index 0c64247..0000000 --- a/tests/repository/1/misc/stable/repositories +++ /dev/null @@ -1,3 +0,0 @@ -# misc/stable -# -: 1 diff --git a/tests/repository/1/misc/testing/libhello-1.0.0-1.tar.bz2 b/tests/repository/1/misc/testing/libhello-1.0.0-1.tar.bz2 deleted file mode 100644 index 501d0ef..0000000 Binary files a/tests/repository/1/misc/testing/libhello-1.0.0-1.tar.bz2 and /dev/null differ diff --git a/tests/repository/1/misc/testing/repositories b/tests/repository/1/misc/testing/repositories deleted file mode 100644 index 8f5e35c..0000000 --- a/tests/repository/1/misc/testing/repositories +++ /dev/null @@ -1,6 +0,0 @@ -# misc/testing -# -: 1 -location: ../stable -role: complement -: diff --git a/tests/repository/publish.sh b/tests/repository/publish.sh new file mode 100755 index 0000000..2124ead --- /dev/null +++ b/tests/repository/publish.sh @@ -0,0 +1,10 @@ +#!/bin/sh + +# Some commonly useful addtional options that can be specified via the +# command line: +# +# --dry-run +# --progress +# +rsync -v -rlpt --exclude '.*' --copy-unsafe-links --prune-empty-dirs \ +--delete-after $* 1/ pkg.cppget.org:/var/bpkg/tests/1/ diff --git a/tests/test.sh b/tests/test.sh index c553f58..08ba9d7 100755 --- a/tests/test.sh +++ b/tests/test.sh @@ -1,10 +1,29 @@ #! /usr/bin/env bash -# -v Run verbose. By default, this script runs bpkg quiet and suppresses +# Usage: test.sh [test-options] [bpkg-common-options] +# +# Test options are: +# +# -v +# Run verbose. By default, this script runs bpkg quiet and suppresses # error messages in the fail tests. Note that when this options is # specified, bpkg is called with default verbosity level. If you want # more bpkg diagnostics, add the --verbose N option. # +# --remote +# Test using the remote repositories. Normally, you would first run the +# local test in order to create the repositories, then publish them (see +# repository/publish.sh), and finally run the remote test. +# +# --valgrind +# Run under valgrind (takes forever). +# +# Some common bpkg use-cases worth testing: +# +# --fetch wget +# --fetch curl +# --fetch fetch --tar bsdtar +# trap 'exit 1' ERR @@ -15,20 +34,10 @@ function error () } bpkg="../bpkg/bpkg" -#bpkg="valgrind -q ../bpkg/bpkg" -#bpkg="../bpkg/bpkg --fetch curl" -#bpkg="../bpkg/bpkg --fetch fetch --tar bsdtar" cfg=/tmp/conf -pkg=libhello -ver=1.0.0 -pkga=../../hello/dist/$pkg-$ver.tar.bz2 -pkgd=../../hello/dist/$pkg-$ver -out=$cfg/`basename $pkgd` -rep=../../hello/1/hello - -abs_rep=`pwd`/repository/1 verbose=n +remote=n options= while [ $# -gt 0 ]; do @@ -37,7 +46,22 @@ while [ $# -gt 0 ]; do verbose=y shift ;; + --remote) + remote=y + shift + ;; + --valgrind) + bpkg="valgrind -q $bpkg" + shift + ;; *) + # If this is the --verbose bpkg option, switch to the verbose + # mode as well. + # + if [ "$1" == "--verbose" ]; then + verbose=y + fi + options="$options $1" shift ;; @@ -50,6 +74,18 @@ fi bpkg="$bpkg $options" +# Repository location, name, and absolute location prefixes. +# +if [ "$remote" = "y" ]; then + rep=http://pkg.cppget.org/tests/1 + repn=cppget.org/ + repa=$rep +else + rep=repository/1 + repn= + repa=`pwd`/$rep +fi + # # function test () @@ -101,18 +137,10 @@ function fail () # function stat () { - local c="$bpkg pkg-status -d $cfg" + local s=`$bpkg pkg-status -d $cfg $1` - if [ $# -eq 1 ]; then - c="$c $pkg/$ver" - elif [ $# -eq 2 ]; then - c="$c $1"; shift - fi - - local s=`$c` - - if [ "$s" != "$1" ]; then - error "status: '"$s"', expected: '"$1"'" + if [ "$s" != "$2" ]; then + error "status: '"$s"', expected: '"$2"'" fi } @@ -131,12 +159,14 @@ function gone () fail rep-create # no 'repositories' file -test rep-create repository/1/misc/stable -test rep-create repository/1/misc/testing +test rep-create repository/1/common/hello + +test rep-create repository/1/common/foo/stable +test rep-create repository/1/common/foo/testing -test rep-create repository/1/math/stable -test rep-create repository/1/math/testing -test rep-create repository/1/math/unstable +test rep-create repository/1/common/bar/stable +test rep-create repository/1/common/bar/testing +test rep-create repository/1/common/bar/unstable ## ## rep-info @@ -144,34 +174,43 @@ test rep-create repository/1/math/unstable fail rep-info # repository location expected -test rep-info repository/1/misc/testing <= 1.1.0 +location: libbar-1.1.1.tar.gz EOF ## ## cfg-create ## -test cfg-create --wipe config.cxx=g++-4.9 cxx config.install.root=/tmp/install -stat unknown +test cfg-create --wipe cxx config.install.root=/tmp/install +stat libfoo unknown + +test cfg-create --wipe config.install.root=/tmp/install cxx +stat libfoo unknown ## ## rep-add @@ -185,13 +224,13 @@ fail rep-add http:// # invalid location # relative path # -test rep-add ./1/math/stable -fail rep-add ./1/../1/math/stable # duplicate +test rep-add ./1/bar/stable +fail rep-add ./1/../1/bar/stable # duplicate # absolute path # -test rep-add /tmp/1/misc/stable -fail rep-add /tmp/1/../1/misc/stable # duplicate +test rep-add /tmp/1/foo/stable +fail rep-add /tmp/1/../1/foo/stable # duplicate # remote URL # @@ -209,34 +248,29 @@ fail rep-fetch # no repositories # hello repository # test cfg-create --wipe -test rep-add $rep +test rep-add $rep/common/hello test rep-fetch test rep-fetch -# math/unstable repository +# bar/unstable repository # test cfg-create --wipe -test rep-add repository/1/math/unstable +test rep-add $rep/common/bar/unstable test rep-fetch test rep-fetch # both # test cfg-create --wipe -test rep-add $rep -test rep-add repository/1/math/unstable +test rep-add $rep/common/hello +test rep-add $rep/common/bar/unstable test rep-fetch test rep-fetch -# remote -# -test cfg-create --wipe -test rep-add http://pkg.cppget.org/1/hello -test rep-fetch - ## ## pkg-fetch ## + test rep-create repository/1/fetch/t1 test cfg-create --wipe @@ -248,60 +282,42 @@ fail pkg-fetch libfoo # package version expected fail pkg-fetch libfoo/1/2/3 # invalid package version fail pkg-fetch libfoo/1.0.0 # no repositories -test rep-add repository/1/fetch/t1 +test rep-add $rep/fetch/t1 fail pkg-fetch libfoo/1.0.0 # no packages test rep-fetch fail pkg-fetch libfoo/2+1.0.0 # not available -# local -# test cfg-create --wipe -test rep-add repository/1/fetch/t1 +test rep-add $rep/fetch/t1 test rep-fetch test pkg-fetch libfoo/1.0.0 stat libfoo/1.0.0 fetched fail pkg-fetch libfoo/1.0.0 -fail pkg-fetch -e repository/1/fetch/t1/libfoo-1.0.0.tar.gz +fail pkg-fetch -e repository/1/fetch/libfoo-1.0.0.tar.gz test pkg-purge libfoo -test pkg-fetch -e repository/1/fetch/t1/libfoo-1.0.0.tar.gz +test pkg-fetch -e repository/1/fetch/libfoo-1.0.0.tar.gz stat libfoo/1.0.0 fetched test pkg-unpack libfoo test pkg-fetch -r libfoo/1.1.0 stat libfoo/1.1.0 fetched test pkg-unpack libfoo -test pkg-fetch -r -e repository/1/fetch/t1/libfoo-1.0.0.tar.gz +test pkg-fetch -r -e repository/1/fetch/libfoo-1.0.0.tar.gz stat libfoo/1.0.0 fetched test pkg-fetch -r libfoo/1.1.0 stat libfoo/1.1.0 fetched -test pkg-fetch -r -e repository/1/fetch/t1/libfoo-1.0.0.tar.gz +test pkg-fetch -r -e repository/1/fetch/libfoo-1.0.0.tar.gz stat libfoo/1.0.0 fetched test pkg-purge libfoo -# remote +# hello # test cfg-create --wipe -test rep-add http://pkg.cppget.org/1/hello +test rep-add $rep/common/hello test rep-fetch -#test pkg-fetch libheavy/1.0.0 test pkg-fetch libhello/1.0.0 test pkg-unpack libhello test pkg-purge libhello -## @@ -## -## - -test cfg-create --wipe config.cxx=g++-4.9 cxx config.install.root=/tmp/install -stat unknown - -# fetch existing archive -# -stat unknown -test pkg-fetch -e $pkga -stat fetched -test pkg-purge $pkg -stat unknown - ## ## pkg-unpack ## @@ -311,7 +327,7 @@ stat unknown # replace # test cfg-create --wipe -test rep-add repository/1/fetch/t1 +test rep-add $rep/fetch/t1 test rep-fetch test pkg-fetch libfoo/1.0.0 fail pkg-unpack -e repository/1/fetch/libfoo-1.1.0 @@ -325,192 +341,199 @@ test pkg-unpack -r -e repository/1/fetch/libfoo-1.1.0 stat libfoo/1.1.0 unpacked test pkg-purge libfoo - ## ## pkg-purge ## -fail pkg-purge -fail pkg-purge $pkg +test cfg-create --wipe + +fail pkg-purge # missing package name +fail pkg-purge libfoo # no such package # purge fetched # -test pkg-fetch -e $pkga -test pkg-purge $pkg -stat unknown +test pkg-fetch -e repository/1/fetch/libfoo-1.0.0.tar.gz +test pkg-purge libfoo +stat libfoo unknown # --keep # -test pkg-fetch -e $pkga -test pkg-purge -k $pkg -stat fetched -test pkg-purge $pkg +test pkg-fetch -e repository/1/fetch/libfoo-1.0.0.tar.gz +test pkg-purge -k libfoo +stat libfoo "fetched 1.0.0" +test pkg-purge libfoo -# archive --purge +# archive and --purge # -cp $pkga $cfg/ -test pkg-fetch -e -p $cfg/`basename $pkga` -test pkg-purge $pkg -stat unknown -gone $cfg/`basename $pkga` +cp repository/1/fetch/libfoo-1.0.0.tar.gz $cfg/ +test pkg-fetch -e -p $cfg/libfoo-1.0.0.tar.gz +test pkg-purge libfoo +stat libfoo unknown +gone $cfg/libfoo-1.0.0.tar.gz # no archive but --keep # -test pkg-unpack -e $pkgd -fail pkg-purge --keep $pkg -stat unpacked -test pkg-purge $pkg +test pkg-unpack -e repository/1/fetch/libfoo-1.1.0 +fail pkg-purge --keep libfoo +stat libfoo "unpacked 1.1.0" +test pkg-purge libfoo # purge unpacked directory # -test pkg-unpack -e $pkgd -test pkg-purge $pkg -stat unknown +test pkg-unpack -e repository/1/fetch/libfoo-1.1.0 +test pkg-purge libfoo +stat libfoo unknown # purge unpacked archive # -test pkg-fetch -e $pkga -test pkg-unpack $pkg -test pkg-purge $pkg -stat unknown -gone $out +test pkg-fetch -e repository/1/fetch/libfoo-1.0.0.tar.gz +test pkg-unpack libfoo +test pkg-purge libfoo +stat libfoo unknown +gone $cfg/libfoo-1.0.0 # purge unpacked archive but --keep # -test pkg-fetch -e $pkga -test pkg-unpack $pkg -test pkg-purge --keep $pkg -stat fetched -gone $out -test pkg-purge $pkg - -# directory --purge +test pkg-fetch -e repository/1/fetch/libfoo-1.0.0.tar.gz +test pkg-unpack libfoo +test pkg-purge --keep libfoo +stat libfoo "fetched 1.0.0" +gone $cfg/libfoo-1.0.0 +test pkg-purge libfoo +stat libfoo unknown + +# directory and --purge # -cp -r $pkgd $cfg/ -test pkg-unpack -e -p $out -test pkg-purge $pkg -stat unknown -gone $out +cp -r repository/1/fetch/libfoo-1.1.0 $cfg/ +test pkg-unpack -e -p $cfg/libfoo-1.1.0 +test pkg-purge libfoo +stat libfoo unknown +gone $cfg/libfoo-1.1.0 -# archive --purge +# archive and --purge # -cp $pkga $cfg/ -test pkg-fetch -e -p $cfg/`basename $pkga` -test pkg-unpack $pkg -test pkg-purge $pkg -stat unknown -gone $out -gone $cfg/`basename $pkga` +cp repository/1/fetch/libfoo-1.0.0.tar.gz $cfg/ +test pkg-fetch -e -p $cfg/libfoo-1.0.0.tar.gz +test pkg-unpack libfoo +test pkg-purge libfoo +stat libfoo unknown +gone $cfg/libfoo-1.0.0 +gone $cfg/libfoo-1.0.0.tar.gz # broken # -cp $pkga $cfg/ -test pkg-fetch -e -p $cfg/`basename $pkga` -test pkg-unpack $pkg -chmod 000 $out -fail pkg-purge $pkg -stat broken -fail pkg-purge $pkg # need --force -fail pkg-purge -f -k $pkg # can't keep broken -fail pkg-purge -f $pkg # directory still exists -chmod 755 $out -rm -r $out -fail pkg-purge -f $pkg # archive still exists -rm $cfg/`basename $pkga` -test pkg-purge -f $pkg -stat unknown +cp repository/1/fetch/libfoo-1.0.0.tar.gz $cfg/ +test pkg-fetch -e -p $cfg/libfoo-1.0.0.tar.gz +test pkg-unpack libfoo +chmod 000 $cfg/libfoo-1.0.0 +fail pkg-purge libfoo +stat libfoo/1.0.0 broken +fail pkg-purge libfoo # need --force +fail pkg-purge -f -k libfoo # can't keep broken +fail pkg-purge -f libfoo # out directory still exists +chmod 755 $cfg/libfoo-1.0.0 +rm -r $cfg/libfoo-1.0.0 +fail pkg-purge -f libfoo # archive still exists +rm $cfg/libfoo-1.0.0.tar.gz +test pkg-purge -f libfoo +stat libfoo unknown ## ## pkg-configure/pkg-disfigure ## +test cfg-create --wipe +test rep-add $rep/common/hello +test rep-fetch + fail pkg-configure # package name expected fail pkg-configure config.dist.root=/tmp # ditto -fail pkg-configure $pkg $pkg # unexpected argument -fail pkg-configure $pkg # no such package +fail pkg-configure libhello libhello # unexpected argument +fail pkg-configure libhello1 # no such package fail pkg-disfigure # package name expected -fail pkg-disfigure $pkg # no such package +fail pkg-disfigure libhello1 # no such package -test pkg-fetch -e $pkga +test pkg-fetch libhello/1.0.0 -fail pkg-configure $pkg # wrong package state -fail pkg-disfigure $pkg # wrong package state +fail pkg-configure libhello # wrong package state +fail pkg-disfigure libhello # wrong package state -test pkg-purge $pkg +test pkg-purge libhello # src == out # -test pkg-fetch -e $pkga -test pkg-unpack $pkg -test pkg-configure $pkg -stat configured -test pkg-disfigure $pkg -stat unpacked -test pkg-purge $pkg -stat unknown +test pkg-fetch libhello/1.0.0 +test pkg-unpack libhello +test pkg-configure libhello +stat libhello "configured 1.0.0" +test pkg-disfigure libhello +stat libhello "unpacked 1.0.0" +test pkg-purge libhello +stat libhello/1.0.0 available # src != out # -test pkg-unpack -e $pkgd -test pkg-configure $pkg -stat configured -test pkg-disfigure $pkg -stat unpacked -test pkg-purge $pkg -stat unknown -gone $out +test cfg-create --wipe +test pkg-unpack -e repository/1/common/libhello-1.0.0 +test pkg-configure libhello +stat libhello "configured 1.0.0" +test pkg-disfigure libhello +stat libhello "unpacked 1.0.0" +test pkg-purge libhello +stat libhello unknown +gone $cfg/libhello-1.0.0 # out still exists after disfigure # -test pkg-unpack -e $pkgd -test pkg-configure $pkg -touch $out/stray -fail pkg-disfigure $pkg -stat broken -rm -r $out -test pkg-purge -f $pkg -stat unknown +test pkg-unpack -e repository/1/common/libhello-1.0.0 +test pkg-configure libhello +touch $cfg/libhello-1.0.0/stray +fail pkg-disfigure libhello +stat libhello/1.0.0 broken +rm -r $cfg/libhello-1.0.0 +test pkg-purge -f libhello +stat libhello unknown # disfigure failed # -test pkg-unpack -e $pkgd -test pkg-configure $pkg -chmod 555 $out -fail pkg-disfigure $pkg -stat broken -chmod 755 $out -rm -r $out -test pkg-purge -f $pkg -stat unknown +test pkg-unpack -e repository/1/common/libhello-1.0.0 +test pkg-configure libhello +chmod 555 $cfg/libhello-1.0.0 +fail pkg-disfigure libhello +stat libhello/1.0.0 broken +chmod 755 $cfg/libhello-1.0.0 +rm -r $cfg/libhello-1.0.0 +test pkg-purge -f libhello +stat libhello unknown # configure failed but disfigure succeeds # -test pkg-unpack -e $pkgd -mkdir -p $out/build -chmod 555 $out/build -fail pkg-configure $pkg -stat unpacked -test pkg-purge $pkg -stat unknown +test pkg-unpack -e repository/1/common/libhello-1.0.0 +mkdir -p $cfg/libhello-1.0.0/build +chmod 555 $cfg/libhello-1.0.0/build +fail pkg-configure libhello +stat libhello "unpacked 1.0.0" +test pkg-purge libhello +stat libhello unknown # configure and disfigure both failed # -test pkg-unpack -e $pkgd -mkdir -p $out/build -chmod 555 $out $out/build # Both to trip configure and disfigure. -fail pkg-configure $pkg -stat broken -chmod 755 $out $out/build -rm -r $out -test pkg-purge -f $pkg -stat unknown +test pkg-unpack -e repository/1/common/libhello-1.0.0 +mkdir -p $cfg/libhello-1.0.0/build +chmod 555 $cfg/libhello-1.0.0 $cfg/libhello-1.0.0/build # Trip both con/dis. +fail pkg-configure libhello +stat libhello/1.0.0 broken +chmod 755 $cfg/libhello-1.0.0 $cfg/libhello-1.0.0/build +rm -r $cfg/libhello-1.0.0 +test pkg-purge -f libhello +stat libhello unknown # dependency management # test rep-create repository/1/depend/stable test cfg-create --wipe -test rep-add repository/1/depend/stable +test rep-add $rep/depend/stable test rep-fetch test pkg-fetch libbar/1.0.0 @@ -587,7 +610,7 @@ test rep-create repository/1/status/unstable test cfg-create --wipe stat libfoo/1.0.0 "unknown" stat libfoo "unknown" -test rep-add repository/1/status/stable +test rep-add $rep/status/stable test rep-fetch stat libfoo/1.0.0 "available" stat libfoo "available 1.0.0" @@ -598,20 +621,20 @@ stat libfoo "fetched 1.0.0" # multiple versions/revisions # test cfg-create --wipe -test rep-add repository/1/status/extra +test rep-add $rep/status/extra test rep-fetch stat libbar "available 1.1.0-1" -test rep-add repository/1/status/stable +test rep-add $rep/status/stable test rep-fetch stat libbar "available 1.1.0-1 1.0.0" test cfg-create --wipe -test rep-add repository/1/status/testing +test rep-add $rep/status/testing test rep-fetch stat libbar "available 1.1.0 1.0.0-1 1.0.0" test cfg-create --wipe -test rep-add repository/1/status/unstable +test rep-add $rep/status/unstable test rep-fetch stat libbar "available 2.0.0 1.1.0 1.0.0-1 1.0.0" test pkg-fetch libbar/1.0.0-1 @@ -624,78 +647,88 @@ stat libbar "fetched 2.0.0" ## pkg-update ## -fail pkg-update # package name expected -fail pkg-update $pkg # no such package -test pkg-fetch -e $pkga -fail pkg-update $pkg # wrong package state -test pkg-purge $pkg +test cfg-create --wipe +test rep-add $rep/common/hello +test rep-fetch + +fail pkg-update # package name expected +fail pkg-update libhello # no such package +test pkg-fetch libhello/1.0.0 +fail pkg-update libhello # wrong package state +test pkg-purge libhello # src == out # -test pkg-fetch -e $pkga -test pkg-unpack $pkg -test pkg-configure $pkg -test pkg-update $pkg -test pkg-update $pkg -test pkg-disfigure $pkg -test pkg-purge $pkg +test pkg-fetch libhello/1.0.0 +test pkg-unpack libhello +test pkg-configure libhello +test pkg-update libhello +test pkg-update libhello +test pkg-disfigure libhello +test pkg-purge libhello # src != out # -test pkg-unpack -e $pkgd -test pkg-configure $pkg -test pkg-update $pkg -test pkg-update $pkg -test pkg-disfigure $pkg -test pkg-purge $pkg +test cfg-create --wipe +test pkg-unpack -e repository/1/common/libhello-1.0.0 +test pkg-configure libhello +test pkg-update libhello +test pkg-update libhello +test pkg-disfigure libhello +test pkg-purge libhello ## ## pkg-clean ## -fail pkg-clean # package name expected -fail pkg-clean $pkg # no such package -test pkg-fetch -e $pkga -fail pkg-clean $pkg # wrong package state -test pkg-purge $pkg +test cfg-create --wipe +test rep-add $rep/common/hello +test rep-fetch + +fail pkg-clean # package name expected +fail pkg-clean libhello # no such package +test pkg-fetch libhello/1.0.0 +fail pkg-clean libhello # wrong package state +test pkg-purge libhello # src == out # -test pkg-fetch -e $pkga -test pkg-unpack $pkg -test pkg-configure $pkg -test pkg-update $pkg -test pkg-clean $pkg -test pkg-clean $pkg -test pkg-disfigure $pkg -test pkg-purge $pkg +test pkg-fetch libhello/1.0.0 +test pkg-unpack libhello +test pkg-configure libhello +test pkg-update libhello +test pkg-clean libhello +test pkg-clean libhello +test pkg-disfigure libhello +test pkg-purge libhello # src != out # -test pkg-unpack -e $pkgd -test pkg-configure $pkg -test pkg-update $pkg -test pkg-clean $pkg -test pkg-clean $pkg -test pkg-disfigure $pkg -test pkg-purge $pkg +test cfg-create --wipe +test pkg-unpack -e repository/1/common/libhello-1.0.0 +test pkg-configure libhello +test pkg-update libhello +test pkg-clean libhello +test pkg-clean libhello +test pkg-disfigure libhello +test pkg-purge libhello ## ## Low-level command scenarios. ## -# build package from remote repository +# build and clean package # test cfg-create --wipe cxx -test rep-add http://pkg.cppget.org/1/hello +test rep-add $rep/common/hello test rep-fetch -test pkg-fetch $pkg/$ver -test pkg-unpack $pkg -test pkg-configure $pkg -test pkg-update $pkg -test pkg-clean $pkg -test pkg-disfigure $pkg -test pkg-purge $pkg +test pkg-fetch libhello/1.0.0 +test pkg-unpack libhello +test pkg-configure libhello +test pkg-update libhello +test pkg-clean libhello +test pkg-disfigure libhello +test pkg-purge libhello ## ## High-level commands. @@ -730,7 +763,7 @@ test build -p libfoo/1.1.0 libfoo/1.1.0 <<< "build libfoo 1.1.0" fail build -p libfoo/1.0.0 test pkg-purge libfoo -test rep-add repository/1/satisfy/t1 +test rep-add $rep/satisfy/t1 test rep-fetch test build -p libfoo <<< "build libfoo 1.0.0" test build -p libfoo/1.0.0 <<< "build libfoo 1.0.0" @@ -760,7 +793,7 @@ test cfg-create --wipe fail build repository/1/satisfy/libbar-1.0.0.tar.gz -test rep-add repository/1/satisfy/t2 +test rep-add $rep/satisfy/t2 test rep-fetch test build -p libbar <