From b810795b6689ab9e1635af21a48660305b2a7820 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 10 May 2014 22:48:36 -0400 Subject: test/librechroot: 'exit' isn't an executable program. This test worked before because of work-arounds for systemd bugs, it had invoked bash inside of the chroot. --- test/librechroot-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/librechroot-test.sh b/test/librechroot-test.sh index c22ac58..43f3143 100644 --- a/test/librechroot-test.sh +++ b/test/librechroot-test.sh @@ -40,7 +40,7 @@ it_respects_exit_status_if_out_isnt_a_tty() ( set -o pipefail libremessages msg 'Creating a chroot, may take a few minutes' &>/dev/tty r=0 - { testsudo librechroot -l "$roundup_test_name" run exit 3 | cat; } || r=$? + { testsudo librechroot -l "$roundup_test_name" run bash -c 'exit 3' | cat; } || r=$? [[ $r == 3 ]] ) -- cgit v1.2.3-2-g168b From 79e4605a163199344df44b8947a15bac9ece75d0 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sat, 10 May 2014 22:59:37 -0400 Subject: Add a rough test of file order from librefetch's tarballs. --- test/librefetch-test.sh | 1 + test/librefetch.d/PKGBUILD | 5 ++++- test/librefetch.d/list.txt | 5 ++++- 3 files changed, 9 insertions(+), 2 deletions(-) (limited to 'test') diff --git a/test/librefetch-test.sh b/test/librefetch-test.sh index 43b7a69..675299a 100644 --- a/test/librefetch-test.sh +++ b/test/librefetch-test.sh @@ -31,6 +31,7 @@ it_displays_help() { empty $tmpdir/stderr } +# This test also does a rough test of file order in the PKGBUILD it_cleans_src_libre_first() { cp librefetch.d/* "$tmpdir/" cd "$tmpdir" diff --git a/test/librefetch.d/PKGBUILD b/test/librefetch.d/PKGBUILD index 723d82e..db80db3 100644 --- a/test/librefetch.d/PKGBUILD +++ b/test/librefetch.d/PKGBUILD @@ -7,7 +7,10 @@ source=("libre://$pkgname-$pkgver.tar.gz") mksource() { mkdir "$srcdir/bar" - touch "$srcdir/bar/file" + local file + for file in '~foo' '~a' a A; do + touch "$srcdir/bar/$file" + done } package() { diff --git a/test/librefetch.d/list.txt b/test/librefetch.d/list.txt index b04d5d1..9bd32f4 100644 --- a/test/librefetch.d/list.txt +++ b/test/librefetch.d/list.txt @@ -1,2 +1,5 @@ bar/ -bar/file +bar/A +bar/a +bar/~a +bar/~foo -- cgit v1.2.3-2-g168b From 6f5910a55f72c5d01a26b685a7a06a6673a2e9f7 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Sun, 11 May 2014 01:36:44 -0400 Subject: test/librefetch: inhibit running an installed copy of librefetch --- test/librefetch-test.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'test') diff --git a/test/librefetch-test.sh b/test/librefetch-test.sh index 675299a..9db836b 100644 --- a/test/librefetch-test.sh +++ b/test/librefetch-test.sh @@ -9,7 +9,7 @@ before() { mkdir -p "$HOME" printf '%s\n' \ - "DLAGENTS+=({https,libre}'::$(which librefetch) -p \"\$BUILDFILE\" -- %u %o')" \ + "DLAGENTS=({https,libre}'::$(which librefetch) -p \"\$BUILDFILE\" -- %u %o')" \ 'BUILDDIR=""' \ > "$HOME/.makepkg.conf" -- cgit v1.2.3-2-g168b