Merge branch '1.7.x'

test/CMakeLists.txt

@@ -85,5 +85,10 @@ externalproject_add(inttest_bin
 	"-DZNC_BIN_DIR:path=${CMAKE_INSTALL_FULL_BINDIR}"
 	"-DQt5_HINTS:path=${brew_qt5}")
 add_custom_target(inttest COMMAND
+	# Prevent a warning from test of znc-buildmod, when inner make
+	# discovers that there is an outer make and tries to use it:
+	# gmake[4]: warning: jobserver unavailable: using -j1.  Add '+' to parent make rule.
+	# This option doesn't affect ninja, which doesn't show that warning anyway.
+	${CMAKE_COMMAND} -E env MAKEFLAGS=
 	"${CMAKE_CURRENT_BINARY_DIR}/integration/inttest")
 add_dependencies(inttest inttest_bin)

test/integration/framework/base.cpp

@@ -45,17 +45,17 @@ Process::Process(QString cmd, QStringList args,
 
 Process::~Process() {
     if (m_kill) m_proc.terminate();
-    [this]() {
-        ASSERT_TRUE(m_proc.waitForFinished());
-        if (!m_allowDie) {
-            ASSERT_EQ(QProcess::NormalExit, m_proc.exitStatus());
-            if (m_allowLeak) {
-                ASSERT_THAT(m_proc.exitStatus(), AnyOf(Eq(23), Eq(m_exit)));
-            } else {
-                ASSERT_EQ(m_exit, m_proc.exitCode());
-            }
+    bool bFinished = m_proc.waitForFinished();
+    EXPECT_TRUE(bFinished);
+    if (!bFinished) return;
+    if (!m_allowDie) {
+        EXPECT_EQ(m_proc.exitStatus(), QProcess::NormalExit);
+        if (m_allowLeak) {
+            EXPECT_THAT(m_proc.exitStatus(), AnyOf(Eq(23), Eq(m_exit)));
+        } else {
+            EXPECT_EQ(m_proc.exitCode(), m_exit);
         }
-    }();
+    }
 }
 
 }  // namespace znc_inttest

translations/nl_NL

@@ -0,0 +1 @@
+SelfName Nederlands