From b6a4330fe4475f4f496d3205cebe03085ee2a346 Mon Sep 17 00:00:00 2001 From: Norbert Pocs Date: Thu, 30 Jun 2022 16:43:35 +0200 Subject: [PATCH] Change include order in unittest files The tests are compiled without -D_GNU_SOURCE, therefore the XSI version of strerror_r is used. Defining _GNU_SOURCE in torture.h then including *.c gives error because it is assuming GNU version of strerror_r in the source file. Signed-off-by: Norbert Pocs Reviewed-by: Jakub Jelen --- tests/unittests/torture_knownhosts_parsing.c | 2 +- tests/unittests/torture_misc.c | 2 +- tests/unittests/torture_pki.c | 2 +- tests/unittests/torture_pki_dsa.c | 2 +- tests/unittests/torture_pki_ecdsa.c | 2 +- tests/unittests/torture_pki_ecdsa_uri.c | 2 +- tests/unittests/torture_pki_ed25519.c | 2 +- tests/unittests/torture_pki_rsa.c | 2 +- tests/unittests/torture_pki_rsa_uri.c | 2 +- tests/unittests/torture_threads_pki_rsa.c | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/tests/unittests/torture_knownhosts_parsing.c b/tests/unittests/torture_knownhosts_parsing.c index bde0eb60..daffc1a4 100644 --- a/tests/unittests/torture_knownhosts_parsing.c +++ b/tests/unittests/torture_knownhosts_parsing.c @@ -4,10 +4,10 @@ #define LIBSSH_STATIC #include -#include "torture.h" #include "knownhosts.c" +#include "torture.h" #if (defined _WIN32) || (defined _WIN64) #ifndef S_IRWXO #define S_IRWXO 0 diff --git a/tests/unittests/torture_misc.c b/tests/unittests/torture_misc.c index c7b99b5d..354f37bc 100644 --- a/tests/unittests/torture_misc.c +++ b/tests/unittests/torture_misc.c @@ -13,8 +13,8 @@ #define LIBSSH_STATIC #include -#include "torture.h" #include "misc.c" +#include "torture.h" #include "error.c" #define TORTURE_TEST_DIR "/usr/local/bin/truc/much/.." diff --git a/tests/unittests/torture_pki.c b/tests/unittests/torture_pki.c index a1ddb8c7..008f29ad 100644 --- a/tests/unittests/torture_pki.c +++ b/tests/unittests/torture_pki.c @@ -5,10 +5,10 @@ #include #include +#include "pki.c" #include "torture.h" #include "torture_pki.h" #include "torture_key.h" -#include "pki.c" const unsigned char INPUT[] = "1234567890123456789012345678901234567890" "123456789012345678901234"; diff --git a/tests/unittests/torture_pki_dsa.c b/tests/unittests/torture_pki_dsa.c index b555e487..a98f1bb0 100644 --- a/tests/unittests/torture_pki_dsa.c +++ b/tests/unittests/torture_pki_dsa.c @@ -6,10 +6,10 @@ #include #include +#include "pki.c" #include "torture.h" #include "torture_key.h" #include "torture_pki.h" -#include "pki.c" #define LIBSSH_DSA_TESTKEY "libssh_testkey.id_dsa" #define LIBSSH_DSA_TESTKEY_PASSPHRASE "libssh_testkey_passphrase.id_dsa" diff --git a/tests/unittests/torture_pki_ecdsa.c b/tests/unittests/torture_pki_ecdsa.c index 22f06a46..7d09d984 100644 --- a/tests/unittests/torture_pki_ecdsa.c +++ b/tests/unittests/torture_pki_ecdsa.c @@ -5,10 +5,10 @@ #include #include +#include "pki.c" #include "torture.h" #include "torture_key.h" #include "torture_pki.h" -#include "pki.c" #define LIBSSH_ECDSA_TESTKEY "libssh_testkey.id_ecdsa" #define LIBSSH_ECDSA_TESTKEY_PASSPHRASE "libssh_testkey_passphrase.id_ecdsa" diff --git a/tests/unittests/torture_pki_ecdsa_uri.c b/tests/unittests/torture_pki_ecdsa_uri.c index 0fa6ecf3..d3a12bba 100644 --- a/tests/unittests/torture_pki_ecdsa_uri.c +++ b/tests/unittests/torture_pki_ecdsa_uri.c @@ -6,10 +6,10 @@ #include #include +#include "pki.c" #include "torture.h" #include "torture_pki.h" #include "torture_key.h" -#include "pki.c" #define LIBSSH_ECDSA_TESTKEY "libssh_testkey.id_" #define LIBSSH_ECDSA_TESTKEY_PEM "libssh_testkey_pem.id_" diff --git a/tests/unittests/torture_pki_ed25519.c b/tests/unittests/torture_pki_ed25519.c index ff59b190..2fe53bc3 100644 --- a/tests/unittests/torture_pki_ed25519.c +++ b/tests/unittests/torture_pki_ed25519.c @@ -2,10 +2,10 @@ #define LIBSSH_STATIC +#include "pki.c" #include "torture.h" #include "torture_key.h" #include "torture_pki.h" -#include "pki.c" #include #include diff --git a/tests/unittests/torture_pki_rsa.c b/tests/unittests/torture_pki_rsa.c index 18b5d611..e46a61ee 100644 --- a/tests/unittests/torture_pki_rsa.c +++ b/tests/unittests/torture_pki_rsa.c @@ -6,10 +6,10 @@ #include #include +#include "pki.c" #include "torture.h" #include "torture_pki.h" #include "torture_key.h" -#include "pki.c" #define LIBSSH_RSA_TESTKEY "libssh_testkey.id_rsa" #define LIBSSH_RSA_TESTKEY_PASSPHRASE "libssh_testkey_passphrase.id_rsa" diff --git a/tests/unittests/torture_pki_rsa_uri.c b/tests/unittests/torture_pki_rsa_uri.c index 370c6ec3..1d15db6d 100644 --- a/tests/unittests/torture_pki_rsa_uri.c +++ b/tests/unittests/torture_pki_rsa_uri.c @@ -6,10 +6,10 @@ #include #include +#include "pki.c" #include "torture.h" #include "torture_pki.h" #include "torture_key.h" -#include "pki.c" #define LIBSSH_RSA_TESTKEY "libssh_testkey.id_rsa" #define LIBSSH_RSA_TESTKEY_PASSPHRASE "libssh_testkey_passphrase.id_rsa" diff --git a/tests/unittests/torture_threads_pki_rsa.c b/tests/unittests/torture_threads_pki_rsa.c index a04a7462..5ec8055f 100644 --- a/tests/unittests/torture_threads_pki_rsa.c +++ b/tests/unittests/torture_threads_pki_rsa.c @@ -26,10 +26,10 @@ #include #include +#include "pki.c" #include "torture.h" #include "torture_pki.h" #include "torture_key.h" -#include "pki.c" #include