| Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame^] | 1 | From f9e3e2ee7b18ba5bb8efe083171f3e701eb0a663 Mon Sep 17 00:00:00 2001 |
| 2 | From: Your Name <you@example.com> |
| 3 | Date: Mon, 28 Dec 2020 02:08:03 +0000 |
| 4 | Subject: [PATCH] Don't let host enviroment to decide if a test is build |
| 5 | |
| 6 | test ssh2.sh need sshd, for cross compile, we need it on target, so |
| 7 | don't use SSHD on host to decide weither to build a test |
| 8 | |
| 9 | Upstream-Status: Inappropriate[oe specific] |
| 10 | |
| 11 | Signed-off-by: Changqing Li <changqing.li@windriver.com> |
| 12 | --- |
| 13 | tests/Makefile.am | 6 +----- |
| 14 | 1 file changed, 1 insertion(+), 5 deletions(-) |
| 15 | |
| 16 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
| 17 | index dc0922f..6cbc35d 100644 |
| 18 | --- a/tests/Makefile.am |
| 19 | +++ b/tests/Makefile.am |
| 20 | @@ -1,16 +1,12 @@ |
| 21 | AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src |
| 22 | LDADD = ../src/libssh2.la |
| 23 | |
| 24 | -if SSHD |
| 25 | noinst_PROGRAMS = ssh2 |
| 26 | ssh2_SOURCES = ssh2.c |
| 27 | -endif |
| 28 | |
| 29 | ctests = simple$(EXEEXT) |
| 30 | TESTS = $(ctests) mansyntax.sh |
| 31 | -if SSHD |
| 32 | TESTS += ssh2.sh |
| 33 | -endif |
| 34 | check_PROGRAMS = $(ctests) |
| 35 | |
| 36 | TESTS_ENVIRONMENT = SSHD=$(SSHD) EXEEXT=$(EXEEXT) |
| 37 | @@ -38,4 +34,4 @@ if OPENSSL |
| 38 | # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c |
| 39 | # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c |
| 40 | EXTRA_DIST += test_public_key_auth_succeeds_with_correct_rsa_openssh_key.c |
| 41 | -endif |
| 42 | \ No newline at end of file |
| 43 | +endif |
| 44 | -- |
| 45 | 2.20.1 |
| 46 | |