From 5e48b50da8e04d55f2a68ddc67758ddbf69fd01a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=A9bastien=20Helleu?= <flashcode@flashtux.org>
Date: Wed, 5 Jul 2017 19:41:11 +0200
Subject: [PATCH] tests: fix double load of plugins when "make install" is
 executed before tests

---
 tests/CMakeLists.txt | 2 +-
 tests/tests.cpp      | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 77ef7ec3d..ee7ed0547 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -76,4 +76,4 @@ add_test(NAME unit
   WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
   COMMAND tests -v)
 set_property(TEST unit PROPERTY
-  ENVIRONMENT "WEECHAT_TESTS_ARGS=-p -r '/set weechat.plugin.path \"${PROJECT_BINARY_DIR}/src/plugins\"'")
+  ENVIRONMENT "WEECHAT_TESTS_ARGS=-r '/set weechat.plugin.path \"${PROJECT_BINARY_DIR}/src/plugins\"'")
diff --git a/tests/tests.cpp b/tests/tests.cpp
index 226206d66..57e73ddb1 100644
--- a/tests/tests.cpp
+++ b/tests/tests.cpp
@@ -133,7 +133,7 @@ main (int argc, char *argv[])
     /* build arguments for WeeChat */
     weechat_tests_args = getenv ("WEECHAT_TESTS_ARGS");
     length = strlen (argv[0]) +
-        64 +  /* --dir ... */
+        64 +  /* -p --dir ... */
         ((weechat_tests_args) ? 1 + strlen (weechat_tests_args) : 0) +
         1;
     args = (char *)malloc (length);
@@ -143,7 +143,7 @@ main (int argc, char *argv[])
         return 1;
     }
     snprintf (args, length,
-              "%s --dir ./tmp_weechat_test%s%s",
+              "%s -p --dir ./tmp_weechat_test%s%s",
               argv[0],
               (weechat_tests_args) ? " " : "",
               (weechat_tests_args) ? weechat_tests_args : "");