aboutsummaryrefslogtreecommitdiffstats
path: root/main/libssh/fix-unittests-torture_config.patch
diff options
context:
space:
mode:
Diffstat (limited to 'main/libssh/fix-unittests-torture_config.patch')
-rw-r--r--main/libssh/fix-unittests-torture_config.patch35
1 files changed, 0 insertions, 35 deletions
diff --git a/main/libssh/fix-unittests-torture_config.patch b/main/libssh/fix-unittests-torture_config.patch
deleted file mode 100644
index ba13385660..0000000000
--- a/main/libssh/fix-unittests-torture_config.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Has been fixed in master with https://bugs.libssh.org/rLIBSSH1f43b52117fc97eef95e3627517cadb531b2b43e
-
-Can be removed as of next release (0.8.7+)
-
---- a/tests/unittests/torture_config.c
-+++ b/tests/unittests/torture_config.c
-@@ -208,16 +208,16 @@
- static void torture_config_glob(void **state) {
- ssh_session session = *state;
- int ret;
--#ifdef HAVE_GLOB
-+#if defined(HAVE_GLOB) && defined(HAVE_GLOB_GL_FLAGS_MEMBER)
- char *v;
--#endif
-+#endif /* HAVE_GLOB && HAVE_GLOB_GL_FLAGS_MEMBER */
-
- ret = ssh_config_parse_file(session, LIBSSH_TESTCONFIG5);
- assert_true(ret == 0); /* non-existing files should not error */
-
- /* Test the variable presence */
-
--#ifdef HAVE_GLOB
-+#if defined(HAVE_GLOB) && defined(HAVE_GLOB_GL_FLAGS_MEMBER)
- ret = ssh_options_get(session, SSH_OPTIONS_PROXYCOMMAND, &v);
- assert_true(ret == 0);
- assert_non_null(v);
-@@ -231,7 +231,7 @@
-
- assert_string_equal(v, ID_FILE);
- SSH_STRING_FREE_CHAR(v);
--#endif /* HAVE_GLOB */
-+#endif /* HAVE_GLOB && HAVE_GLOB_GL_FLAGS_MEMBER */
- }
-
- /**