Skip to content

Simplify Test Build Flags #818

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
JacobBarthelmeh merged 1 commit into from
Jul 17, 2025
Merged

Simplify Test Build Flags #818

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion examples/echoserver/include.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,4 @@ examples_echoserver_echoserver_SOURCES = examples/echoserver/echoserver.c \
examples/echoserver/echoserver.h
examples_echoserver_echoserver_LDADD = src/libwolfssh.la
examples_echoserver_echoserver_DEPENDENCIES = src/libwolfssh.la
examples_echoserver_echoserver_CFLAGS = $(AM_CFLAGS) ${AM_CPPFLAGS}
endif
142 changes: 5 additions & 137 deletions tests/include.am
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,67 +6,13 @@ check_PROGRAMS += tests/unit.test tests/api.test \
tests/testsuite.test tests/kex.test

tests_unit_test_SOURCES = tests/unit.c tests/unit.h
tests_unit_test_CPPFLAGS = -DNO_MAIN_DRIVER
if BUILD_KEYGEN
tests_unit_test_CPPFLAGS += -DWOLFSSH_KEYGEN
endif
if BUILD_SCP
tests_unit_test_CPPFLAGS += -DWOLFSSH_SCP
endif
if BUILD_SFTP
tests_unit_test_CPPFLAGS += -DWOLFSSH_SFTP
endif
if BUILD_TERM
tests_unit_test_CPPFLAGS += -DWOLFSSH_TERM
endif
if BUILD_SHELL
tests_unit_test_CPPFLAGS += -DWOLFSSH_SHELL
endif
if BUILD_AGENT
tests_unit_test_CPPFLAGS += -DWOLFSSH_AGENT
endif
if BUILD_FWD
tests_unit_test_CPPFLAGS += -DWOLFSSH_FWD
endif
if BUILD_CERTS
tests_unit_test_CPPFLAGS += -DWOLFSSH_CERTS
endif
if BUILD_KEYBOARD_INTERACTIVE
tests_unit_test_CPPFLAGS += -DWOLFSSH_KEYBOARD_INTERACTIVE
endif
tests_unit_test_CPPFLAGS = -DNO_MAIN_DRIVER $(AM_CPPFLAGS)
tests_unit_test_LDADD = src/libwolfssh.la
tests_unit_test_DEPENDENCIES = src/libwolfssh.la

tests_api_test_SOURCES = tests/api.c tests/api.h \
examples/echoserver/echoserver.c
tests_api_test_CPPFLAGS = -DNO_MAIN_DRIVER
if BUILD_KEYGEN
tests_api_test_CPPFLAGS += -DWOLFSSH_KEYGEN
endif
if BUILD_SCP
tests_api_test_CPPFLAGS += -DWOLFSSH_SCP
endif
if BUILD_SFTP
tests_api_test_CPPFLAGS += -DWOLFSSH_SFTP
endif
if BUILD_TERM
tests_api_test_CPPFLAGS += -DWOLFSSH_TERM
endif
if BUILD_SHELL
tests_api_test_CPPFLAGS += -DWOLFSSH_SHELL
endif
if BUILD_AGENT
tests_api_test_CPPFLAGS += -DWOLFSSH_AGENT
endif
if BUILD_FWD
tests_api_test_CPPFLAGS += -DWOLFSSH_FWD
endif
if BUILD_CERTS
tests_api_test_CPPFLAGS += -DWOLFSSH_CERTS
endif
if BUILD_KEYBOARD_INTERACTIVE
tests_api_test_CPPFLAGS += -DWOLFSSH_KEYBOARD_INTERACTIVE
endif
tests_api_test_CPPFLAGS = -DNO_MAIN_DRIVER $(AM_CPPFLAGS)
tests_api_test_LDADD = src/libwolfssh.la
tests_api_test_DEPENDENCIES = src/libwolfssh.la

Expand All @@ -77,65 +23,14 @@ tests_testsuite_test_SOURCES = tests/testsuite.c tests/testsuite.h \
examples/client/common.c \
examples/client/common.h \
examples/sftpclient/sftpclient.c
tests_testsuite_test_CPPFLAGS = -DNO_MAIN_DRIVER
if BUILD_KEYGEN
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_KEYGEN
endif
if BUILD_SCP
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_SCP
endif
if BUILD_SFTP
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_SFTP
endif
if BUILD_TERM
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_TERM
endif
if BUILD_SHELL
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_SHELL
endif
if BUILD_AGENT
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_AGENT
endif
if BUILD_FWD
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_FWD
endif
if BUILD_CERTS
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_CERTS
endif
if BUILD_KEYBOARD_INTERACTIVE
tests_testsuite_test_CPPFLAGS += -DWOLFSSH_KEYBOARD_INTERACTIVE
endif
tests_testsuite_test_CPPFLAGS = -DNO_MAIN_DRIVER $(AM_CPPFLAGS)
tests_testsuite_test_LDADD = src/libwolfssh.la
tests_testsuite_test_DEPENDENCIES = src/libwolfssh.la

if BUILD_KEYBOARD_INTERACTIVE
check_PROGRAMS += tests/auth.test
tests_auth_test_SOURCES = tests/auth.c tests/auth.h
tests_auth_test_CPPFLAGS = -DNO_MAIN_DRIVER -DWOLFSSH_KEYBOARD_INTERACTIVE
if BUILD_KEYGEN
tests_auth_test_CPPFLAGS += -DWOLFSSH_KEYGEN
endif
if BUILD_SCP
tests_auth_test_CPPFLAGS += -DWOLFSSH_SCP
endif
if BUILD_SFTP
tests_auth_test_CPPFLAGS += -DWOLFSSH_SFTP
endif
if BUILD_TERM
tests_auth_test_CPPFLAGS += -DWOLFSSH_TERM
endif
if BUILD_SHELL
tests_auth_test_CPPFLAGS += -DWOLFSSH_SHELL
endif
if BUILD_AGENT
tests_auth_test_CPPFLAGS += -DWOLFSSH_AGENT
endif
if BUILD_FWD
tests_auth_test_CPPFLAGS += -DWOLFSSH_FWD
endif
if BUILD_CERTS
tests_auth_test_CPPFLAGS += -DWOLFSSH_CERTS
endif
tests_auth_test_CPPFLAGS = -DNO_MAIN_DRIVER $(AM_CPPFLAGS)
tests_auth_test_LDADD = src/libwolfssh.la
tests_auth_test_DEPENDENCIES = src/libwolfssh.la
endif
Expand All @@ -145,33 +40,6 @@ tests_kex_test_SOURCES = tests/kex.c tests/kex.h \
examples/client/client.c \
examples/client/common.c \
examples/client/common.h
tests_kex_test_CPPFLAGS = -DNO_MAIN_DRIVER
if BUILD_KEYGEN
tests_kex_test_CPPFLAGS += -DWOLFSSH_KEYGEN
endif
if BUILD_SCP
tests_kex_test_CPPFLAGS += -DWOLFSSH_SCP
endif
if BUILD_SFTP
tests_kex_test_CPPFLAGS += -DWOLFSSH_SFTP
endif
if BUILD_TERM
tests_kex_test_CPPFLAGS += -DWOLFSSH_TERM
endif
if BUILD_SHELL
tests_kex_test_CPPFLAGS += -DWOLFSSH_SHELL
endif
if BUILD_AGENT
tests_kex_test_CPPFLAGS += -DWOLFSSH_AGENT
endif
if BUILD_FWD
tests_kex_test_CPPFLAGS += -DWOLFSSH_FWD
endif
if BUILD_CERTS
tests_kex_test_CPPFLAGS += -DWOLFSSH_CERTS
endif
if BUILD_KEYBOARD_INTERACTIVE
tests_kex_test_CPPFLAGS += -DWOLFSSH_KEYBOARD_INTERACTIVE
endif
tests_kex_test_CPPFLAGS = -DNO_MAIN_DRIVER $(AM_CPPFLAGS)
tests_kex_test_LDADD = src/libwolfssh.la
tests_kex_test_DEPENDENCIES = src/libwolfssh.la
13 changes: 11 additions & 2 deletions wolfssh/port.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1490,6 +1490,15 @@ extern "C" {
#endif
#endif /* WOLFSSH_SFTP or WOLFSSH_SCP */

#ifndef WS_MAYBE_UNUSED
#if (defined(__GNUC__) && (__GNUC__ >= 4)) || defined(__clang__) || \
defined(__IAR_SYSTEMS_ICC__)
#define WS_MAYBE_UNUSED __attribute__((unused))
#else
#define WS_MAYBE_UNUSED
#endif
#endif /* WS_MAYBE_UNUSED */

/* setup compiler inlining */
#ifndef INLINE
#ifndef NO_INLINE
Expand All @@ -1502,10 +1511,10 @@ extern "C" {
#elif defined(THREADX)
#define INLINE _Inline
#else
#define INLINE
#define INLINE WS_MAYBE_UNUSED
#endif
#else
#define INLINE
#define INLINE WS_MAYBE_UNUSED
#endif
#endif /* INLINE */

Expand Down
14 changes: 0 additions & 14 deletions wolfssh/test.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -962,13 +962,6 @@ static INLINE void ThreadJoin(THREAD_TYPE thread)
(void)wolfSSL_JoinThread(thread);
}

#ifdef WOLFSSL_THREAD_NO_JOIN
static INLINE void ThreadStartNoJoin(THREAD_CB fun, void* args)
{
(void)wolfSSL_NewThreadNoJoin(fun, args);
}
#endif

#else
typedef THREAD_RETURN (WOLFSSH_THREAD *THREAD_FUNC)(void*);

Expand Down Expand Up @@ -1068,13 +1061,6 @@ static INLINE void ThreadDetach(THREAD_TYPE thread)
#endif
}

static INLINE void ThreadStartNoJoin(THREAD_FUNC fun, void* args)
{
THREAD_TYPE thread;
ThreadStart(fun, args, &thread);
ThreadDetach(thread);
}

#endif /* !WOLFSSH_OLD_THREADING && !WOLFSSH_OLDER_THREADING */

#endif /* WOLFSSH_TEST_THREADING */
Expand Down
Loading