1 |
commit: 74f095b4da46d896961f219265f62c1dafdf4591 |
2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Dec 24 17:31:47 2021 +0000 |
4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Dec 24 17:32:04 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=74f095b4 |
7 |
|
8 |
net-misc/openssh: simplify src_test |
9 |
|
10 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
11 |
|
12 |
net-misc/openssh/openssh-8.8_p1-r4.ebuild | 29 +++++++---------------------- |
13 |
1 file changed, 7 insertions(+), 22 deletions(-) |
14 |
|
15 |
diff --git a/net-misc/openssh/openssh-8.8_p1-r4.ebuild b/net-misc/openssh/openssh-8.8_p1-r4.ebuild |
16 |
index 229620f1605f..738766f60231 100644 |
17 |
--- a/net-misc/openssh/openssh-8.8_p1-r4.ebuild |
18 |
+++ b/net-misc/openssh/openssh-8.8_p1-r4.ebuild |
19 |
@@ -318,34 +318,19 @@ src_configure() { |
20 |
} |
21 |
|
22 |
src_test() { |
23 |
- local t skipped=() failed=() passed=() |
24 |
- local tests=( interop-tests compat-tests ) |
25 |
- |
26 |
+ local tests=( compat-tests ) |
27 |
local shell=$(egetshell "${UID}") |
28 |
if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then |
29 |
- elog "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" |
30 |
- elog "user, so we will run a subset only." |
31 |
- skipped+=( tests ) |
32 |
+ ewarn "Running the full OpenSSH testsuite requires a usable shell for the 'portage'" |
33 |
+ ewarn "user, so we will run a subset only." |
34 |
+ tests+=( interop-tests ) |
35 |
else |
36 |
tests+=( tests ) |
37 |
fi |
38 |
|
39 |
- # It will also attempt to write to the homedir .ssh. |
40 |
- local sshhome=${T}/homedir |
41 |
- mkdir -p "${sshhome}"/.ssh |
42 |
- for t in "${tests[@]}" ; do |
43 |
- # Some tests read from stdin ... |
44 |
- HOMEDIR="${sshhome}" HOME="${sshhome}" TMPDIR="${T}" \ |
45 |
- SUDO="" SSH_SK_PROVIDER="" \ |
46 |
- TEST_SSH_UNSAFE_PERMISSIONS=1 \ |
47 |
- emake -k -j1 ${t} </dev/null \ |
48 |
- && passed+=( "${t}" ) \ |
49 |
- || failed+=( "${t}" ) |
50 |
- done |
51 |
- |
52 |
- einfo "Passed tests: ${passed[*]}" |
53 |
- [[ ${#skipped[@]} -gt 0 ]] && ewarn "Skipped tests: ${skipped[*]}" |
54 |
- [[ ${#failed[@]} -gt 0 ]] && die "Some tests failed: ${failed[*]}" |
55 |
+ local -x SUDO= SSH_SK_PROVIDER= TEST_SSH_UNSAFE_PERMISSIONS=1 |
56 |
+ mkdir -p "${HOME}"/.ssh || die |
57 |
+ emake -j1 "${tests[@]}" </dev/null |
58 |
} |
59 |
|
60 |
# Gentoo tweaks to default config files. |