From 197a235764710beaac8c650a7b34c35977ee3b63 Mon Sep 17 00:00:00 2001 From: Alexey Sokolov Date: Mon, 8 Jun 2026 21:54:17 +0100 Subject: [PATCH] test: Don't wait for SSL question if built without SSL And don't hardcode 6667 in preparation for #2022 --- test/integration/framework/znctest.cpp | 4 +++- test/integration/znctestconfig.h.cmake.in | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/test/integration/framework/znctest.cpp b/test/integration/framework/znctest.cpp index 4c521fd7..5165e46d 100644 --- a/test/integration/framework/znctest.cpp +++ b/test/integration/framework/znctest.cpp @@ -46,8 +46,10 @@ void WriteConfig(QString path) { p.ReadUntil("Set up a network?"); p.Write(); p.ReadUntil("Name [libera]"); p.Write("test"); p.ReadUntil("Server host (host only)"); p.Write("unix:" + path.toUtf8() + "/inttest.ircd"); +#if HAVE_LIBSSL p.ReadUntil("Server uses SSL?"); p.Write(); - p.ReadUntil("6667"); p.Write(); +#endif + p.ReadUntil("Server port"); p.Write(); p.ReadUntil("password"); p.Write(); p.ReadUntil("channels"); p.Write(); p.ReadUntil("Launch ZNC now?"); p.Write("no"); diff --git a/test/integration/znctestconfig.h.cmake.in b/test/integration/znctestconfig.h.cmake.in index 6bb9882b..bec0457a 100644 --- a/test/integration/znctestconfig.h.cmake.in +++ b/test/integration/znctestconfig.h.cmake.in @@ -20,5 +20,6 @@ #cmakedefine WANT_PYTHON 1 #cmakedefine WANT_PERL 1 #cmakedefine HAVE_I18N 1 +#cmakedefine HAVE_LIBSSL 1 #endif /* ZNCTESTCONFIG_H */