From 70b9f3cdcabc217609be96cfdd1fd47133aa273b Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 30 Sep 2018 01:28:53 -0400 Subject: test: librerelease: Begone with setup() - move REPODEST to common.bash - don't bother setting PKGEXT --- test/librerelease-test.sh | 11 ----------- test/test-common.sh | 1 + 2 files changed, 1 insertion(+), 11 deletions(-) (limited to 'test') diff --git a/test/librerelease-test.sh b/test/librerelease-test.sh index 4a20636..5ffbb14 100644 --- a/test/librerelease-test.sh +++ b/test/librerelease-test.sh @@ -3,17 +3,6 @@ describe librerelease . ./test-common.sh -before() { - common_before - - cat >> "$XDG_CONFIG_HOME/libretools/libretools.conf" <<-eot - REPODEST=ssh://repo@repo.parabola.nu:1863/~/staging/$LIBREUSER/staging/ - eot - cat >> "$XDG_CONFIG_HOME/pacman/makepkg.conf" <<-eot - PKGEXT=.pkg.tar.gz - eot -} - it_displays_usage_text() { rm -rf "$XDG_CONFIG_HOME" LC_ALL=C librerelease -h >"$tmpdir/stdout" 2>"$tmpdir/stderr" diff --git a/test/test-common.sh b/test/test-common.sh index 317f159..b7e9c10 100644 --- a/test/test-common.sh +++ b/test/test-common.sh @@ -42,6 +42,7 @@ common_before() { install -Dm644 /dev/stdin "$XDG_CONFIG_HOME"/libretools/libretools.conf <<-eot WORKDIR=${tmpdir@Q}/workdir BLACKLIST=https://git.parabola.nu/blacklist.git/plain/blacklist.txt + REPODEST=ssh://$LIBREUSER@localhost:1863/~/staging/$LIBREUSER/staging/ eot install -Dm644 /dev/stdin "$XDG_CONFIG_HOME"/libretools/chroot.conf <<-eot CHROOTDIR=${chrootdir@Q} -- cgit v1.2.2