diff options
| author |   Sebastian Pipping <sebastian@pipping.org> | 2017-02-19 18:12:48 +0100 |
|---|---|---|
| committer | Sebastian Pipping <sebastian@pipping.org> | 2017-02-19 18:13:08 +0100 |
| commit | 5ab18cfaa6773629817dfd7ea143b53d88d92d38 (patch) | |
| tree | ea76c1a441115683a51280d530fdc5515a8f19c9 | |
| parent | Add simple suite of system tests based on BATS (diff) | |
| download | porticron-5ab18cfaa6773629817dfd7ea143b53d88d92d38.tar.gz porticron-5ab18cfaa6773629817dfd7ea143b53d88d92d38.tar.bz2 porticron-5ab18cfaa6773629817dfd7ea143b53d88d92d38.zip | |
Bypass portageq in test suite for testing on Ubuntu
| -rwxr-xr-x | bin/porticron | 2 | ||||
| -rwxr-xr-x | test.bats | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/bin/porticron b/bin/porticron index 844f6ce..dba785e 100755 --- a/bin/porticron +++ b/bin/porticron @@ -118,7 +118,7 @@ FQDN=$(hostname --fqdn) HOST=$(hostname -s) IP=$(dig +short ${FQDN} | tr '\n' ' ') : ${DATE:=$(date -R)} -PORTDIR=$(portageq get_repo_path $(portageq envvar EROOT) gentoo) +: ${PORTDIR:=$(portageq get_repo_path $(portageq envvar EROOT) gentoo)} # defaults, second half : ${RCPT:=root} @@ -16,6 +16,7 @@ teardown() { _clear_state ; } PORTICRON() { DATE="$(cat test/data/date-r-output.txt)" \ EMERGE=test/mocks/emerge \ + PORTDIR=/usr/portage \ GLSA_CHECK=/bin/true \ SENDMAIL=${SENDMAIL:-/bin/true} \ bin/porticron \ |