From dbd9caa4e84030d47800550aa924b5dbf06cc969 Mon Sep 17 00:00:00 2001 From: Andreas Pokorny Date: Wed, 29 Jul 2015 16:09:59 +0200 Subject: pass an aribtrary application name to MirServer Preparation for 0.15. --- tests/modules/common/qtmir_test.h | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tests/modules/common/qtmir_test.h b/tests/modules/common/qtmir_test.h index 59b9dac..334ef63 100644 --- a/tests/modules/common/qtmir_test.h +++ b/tests/modules/common/qtmir_test.h @@ -64,11 +64,14 @@ private: {std::make_shared()}; }; + +static char const* args = "qtmir-test"; + class FakeMirServer: private TestMirServerInit, public MirServer { public: FakeMirServer() - : MirServer(0, nullptr) + : MirServer(1, &args) { } -- cgit v1.2.3 From 5a0c76af02204e766cef267478aab5e281ad951c Mon Sep 17 00:00:00 2001 From: Andreas Pokorny Date: Fri, 31 Jul 2015 10:28:54 +0200 Subject: make it null terminated --- tests/modules/common/qtmir_test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/modules/common/qtmir_test.h b/tests/modules/common/qtmir_test.h index 334ef63..3056179 100644 --- a/tests/modules/common/qtmir_test.h +++ b/tests/modules/common/qtmir_test.h @@ -65,13 +65,13 @@ private: }; -static char const* args = "qtmir-test"; +namespace { char const* argv[] = { "qtmir-test", nullptr }; } class FakeMirServer: private TestMirServerInit, public MirServer { public: FakeMirServer() - : MirServer(1, &args) + : MirServer(1, argv) { } -- cgit v1.2.3 From ae9bdbeac8f762d9eed4fff86e478d729337090a Mon Sep 17 00:00:00 2001 From: Andreas Pokorny Date: Fri, 31 Jul 2015 10:36:45 +0200 Subject: remove the dummy application name --- tests/modules/common/qtmir_test.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/modules/common/qtmir_test.h b/tests/modules/common/qtmir_test.h index 3056179..9ee81af 100644 --- a/tests/modules/common/qtmir_test.h +++ b/tests/modules/common/qtmir_test.h @@ -65,13 +65,13 @@ private: }; -namespace { char const* argv[] = { "qtmir-test", nullptr }; } +namespace { char const* argv[] = { nullptr }; } class FakeMirServer: private TestMirServerInit, public MirServer { public: FakeMirServer() - : MirServer(1, argv) + : MirServer(0, argv) { } -- cgit v1.2.3