From 15514b1013a22977a451c64b6df229414a9dde6b Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Wed, 23 Sep 2020 13:13:05 +0300 Subject: Add package-archive.bash public module --- tests/.gitignore | 1 + tests/build/root.build | 6 +- tests/buildfile | 4 +- tests/package-archive/buildfile | 8 ++ tests/package-archive/driver.in | 20 ++++ tests/package-archive/libhello-0.1.0+1.tar.gz | Bin 0 -> 3045 bytes tests/package-archive/libhello-0.1.0.tar.gz | Bin 0 -> 3033 bytes tests/package-archive/testscript | 127 ++++++++++++++++++++++++++ tests/publish.testscript | 8 -- tests/publish/buildfile | 8 ++ tests/publish/testscript | 8 ++ 11 files changed, 177 insertions(+), 13 deletions(-) create mode 100644 tests/package-archive/buildfile create mode 100644 tests/package-archive/driver.in create mode 100644 tests/package-archive/libhello-0.1.0+1.tar.gz create mode 100644 tests/package-archive/libhello-0.1.0.tar.gz create mode 100644 tests/package-archive/testscript delete mode 100644 tests/publish.testscript create mode 100644 tests/publish/buildfile create mode 100644 tests/publish/testscript (limited to 'tests') diff --git a/tests/.gitignore b/tests/.gitignore index 35ec43f..2e508a9 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,2 +1,3 @@ +driver test/ test-*/ diff --git a/tests/build/root.build b/tests/build/root.build index 1472384..c3d4252 100644 --- a/tests/build/root.build +++ b/tests/build/root.build @@ -1,6 +1,8 @@ # file : tests/build/root.build # license : MIT; see accompanying LICENSE file -# Setup the utilities that we are testing. +using bash + +# Every exe{} in this subproject is by default a test. # -import publish = bpkg-rep%exe{bpkg-rep-publish} +exe{*}: test = true diff --git a/tests/buildfile b/tests/buildfile index 0beb40f..556ed55 100644 --- a/tests/buildfile +++ b/tests/buildfile @@ -1,6 +1,4 @@ # file : tests/buildfile # license : MIT; see accompanying LICENSE file -./: testscript{*} $publish - -testscript{publish}@./: test = $publish +./: {*/ -build/} diff --git a/tests/package-archive/buildfile b/tests/package-archive/buildfile new file mode 100644 index 0000000..a8ff42b --- /dev/null +++ b/tests/package-archive/buildfile @@ -0,0 +1,8 @@ +# file : tests/package-archive/buildfile +# license : MIT; see accompanying LICENSE file + +import mods = bpkg-rep%bash{package-archive} + +./: exe{driver} file{*.tar.gz} + +exe{driver}: in{driver} $mods testscript diff --git a/tests/package-archive/driver.in b/tests/package-archive/driver.in new file mode 100644 index 0000000..d760a1e --- /dev/null +++ b/tests/package-archive/driver.in @@ -0,0 +1,20 @@ +#!/usr/bin/env bash + +# file : tests/package-archive/driver.in +# license : MIT; see accompanying LICENSE file + +# bpkg utility path. +# +bpkg_rep_bpkg=bpkg + +trap "{ exit 1; }" ERR +set -o errtrace # Trap ERR in functions. + +@import bpkg-rep/package-archive@ + +# Call the function passed on the command line. +# +# Note that we reset IFS to make sure that the function being tested is not +# affected by its value set by the caller. +# +IFS= "$@" diff --git a/tests/package-archive/libhello-0.1.0+1.tar.gz b/tests/package-archive/libhello-0.1.0+1.tar.gz new file mode 100644 index 0000000..8d6bde9 Binary files /dev/null and b/tests/package-archive/libhello-0.1.0+1.tar.gz differ diff --git a/tests/package-archive/libhello-0.1.0.tar.gz b/tests/package-archive/libhello-0.1.0.tar.gz new file mode 100644 index 0000000..604a536 Binary files /dev/null and b/tests/package-archive/libhello-0.1.0.tar.gz differ diff --git a/tests/package-archive/testscript b/tests/package-archive/testscript new file mode 100644 index 0000000..6124d4a --- /dev/null +++ b/tests/package-archive/testscript @@ -0,0 +1,127 @@ +# file : tests/package-archive/testscript +# license : MIT; see accompanying LICENSE file + +# Note that searching for packages directly in $src_base is a bad idea, since +# removing testscript working directories while testing in source makes the +# find utility to fail with the 'no such file or directory' error. Thus, we +# clone the archives into the test working directories and search there. +# +clone_arcs = \ + cp $src_base/libhello-0.1.0.tar.gz $src_base/libhello-0.1.0+1.tar.gz ./ + +: pkg-verify-archive +: +{ + test.arguments += bpkg_rep_pkg_verify_archive + + : non-existing-archive + : + $* libhello-0.1.0.tar.gz 2>>EOE != 0 + error: archive file 'libhello-0.1.0.tar.gz' does not exist + EOE + + : success + : + $* $src_base/libhello-0.1.0.tar.gz >:'libhello 0.1.0 hello' +} + +: pkg-find-archives +: +{ + test.arguments += bpkg_rep_pkg_find_archives + + : none + : + { + $clone_arcs; + + $* 'libhello' '0.2.0' $~ + } + + : package + : + { + $clone_arcs; + + $* 'libhello' '*' $~ >>:/~"%EOO%" + %\( + $~/libhello-0.1.0.tar.gz + $~/libhello-0.1.0+1.tar.gz + %| + $~/libhello-0.1.0+1.tar.gz + $~/libhello-0.1.0.tar.gz + %\) + EOO + } + + : package-version + : + { + $clone_arcs; + + $* 'libhello' '0.1.0' $~ >:/"$~/libhello-0.1.0.tar.gz" + } + + : package-revision + : + { + $clone_arcs; + + $* 'libhello' '0.1.0+1' $~ >:/"$~/libhello-0.1.0+1.tar.gz" + } + + : package-revisions1 + : + { + $clone_arcs; + + $* 'libhello' '0.1.0*' $~ >>:/~"%EOO%" + %\( + $~/libhello-0.1.0.tar.gz + $~/libhello-0.1.0+1.tar.gz + %| + $~/libhello-0.1.0+1.tar.gz + $~/libhello-0.1.0.tar.gz + %\) + EOO + } + + : package-revisions2 + : + { + $clone_arcs; + + $* 'libhello' '0.1.0+2*' $~ >>:/~"%EOO%" + %\( + $~/libhello-0.1.0.tar.gz + $~/libhello-0.1.0+1.tar.gz + %| + $~/libhello-0.1.0+1.tar.gz + $~/libhello-0.1.0.tar.gz + %\) + EOO + } +} + +: pkg-find-archive +: +{ + test.arguments += bpkg_rep_pkg_find_archive + + : non-existent + : + $* 'libhello-0.1.0.*' $~ + + : existing + : + { + $clone_arcs; + + $* 'libhello-0.1.0.*' $~ >>:/"EOO" + libhello + 0.1.0 + hello + $~/libhello-0.1.0.tar.gz + EOO + } +} diff --git a/tests/publish.testscript b/tests/publish.testscript deleted file mode 100644 index f11a171..0000000 --- a/tests/publish.testscript +++ /dev/null @@ -1,8 +0,0 @@ -# file : tests/publish.testscript -# license : MIT; see accompanying LICENSE file - -: args -: -{ - $* 2>~"/usage: .+/" != 0 : no-args -} diff --git a/tests/publish/buildfile b/tests/publish/buildfile new file mode 100644 index 0000000..4cc1bd0 --- /dev/null +++ b/tests/publish/buildfile @@ -0,0 +1,8 @@ +# file : tests/publish/buildfile +# license : MIT; see accompanying LICENSE file + +import publish = bpkg-rep%exe{bpkg-rep-publish} + +./: testscript $publish + +testscript@./: test = $publish diff --git a/tests/publish/testscript b/tests/publish/testscript new file mode 100644 index 0000000..2d3fb4c --- /dev/null +++ b/tests/publish/testscript @@ -0,0 +1,8 @@ +# file : tests/publish/testscript +# license : MIT; see accompanying LICENSE file + +: args +: +{ + $* 2>~"/usage: .+/" != 0 : no-args +} -- cgit v1.1