| Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 1 | From f6abce5ba41a412a247250dcd80e387e53474466 Mon Sep 17 00:00:00 2001 |
| Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 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> |
| Andrew Geissler | eff2747 | 2021-10-29 15:35:00 -0500 | [diff] [blame] | 12 | |
| Andrew Geissler | 90fd73c | 2021-03-05 15:25:55 -0600 | [diff] [blame] | 13 | --- |
| 14 | tests/Makefile.am | 6 +----- |
| 15 | 1 file changed, 1 insertion(+), 5 deletions(-) |
| 16 | |
| 17 | diff --git a/tests/Makefile.am b/tests/Makefile.am |
| 18 | index dc0922f..6cbc35d 100644 |
| 19 | --- a/tests/Makefile.am |
| 20 | +++ b/tests/Makefile.am |
| 21 | @@ -1,16 +1,12 @@ |
| 22 | AM_CPPFLAGS = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src |
| 23 | LDADD = ../src/libssh2.la |
| 24 | |
| 25 | -if SSHD |
| 26 | noinst_PROGRAMS = ssh2 |
| 27 | ssh2_SOURCES = ssh2.c |
| 28 | -endif |
| 29 | |
| 30 | ctests = simple$(EXEEXT) |
| 31 | TESTS = $(ctests) mansyntax.sh |
| 32 | -if SSHD |
| 33 | TESTS += ssh2.sh |
| 34 | -endif |
| 35 | check_PROGRAMS = $(ctests) |
| 36 | |
| 37 | TESTS_ENVIRONMENT = SSHD=$(SSHD) EXEEXT=$(EXEEXT) |
| 38 | @@ -38,4 +34,4 @@ if OPENSSL |
| 39 | # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_encrypted_ed25519_key.c |
| 40 | # EXTRA_DIST += test_public_key_auth_succeeds_with_correct_ed25519_key_from_mem.c |
| 41 | EXTRA_DIST += test_public_key_auth_succeeds_with_correct_rsa_openssh_key.c |
| 42 | -endif |
| 43 | \ No newline at end of file |
| 44 | +endif |