mirror of
https://github.com/weechat/weechat.git
synced 2026-06-12 14:14:48 +02:00
tests: fix double load of plugins when "make install" is executed before tests
This commit is contained in:
@@ -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\"'")
|
||||
|
||||
+2
-2
@@ -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 : "");
|
||||
|
||||
Reference in New Issue
Block a user