add test for core_plugin

add support for installing plugins

Author: rxbryan

source/cli/plugins/CMakeLists.txt

@@ -5,3 +5,9 @@ endif()
 
 # Extension sub-projects
 add_subdirectory(core_plugin)
+
+#Install plugin directory
+install(DIRECTORY ${PROJECT_OUTPUT_DIR}/plugins
+	DESTINATION ${INSTALL_LIB}
+	PATTERN "test[-_]*" EXCLUDE
+)

source/cli/plugins/core_plugin/source/core_plugin.cpp

@@ -14,12 +14,23 @@ void *load(size_t argc, void *args[], void *data)
 {
 	(void)argc;
 	(void)data;
+
 	char *tag = metacall_value_to_string(args[0]);
+	if (tag == NULL)
+	{
+		return metacall_value_create_int(1);
+	}
+
 	size_t size = metacall_value_count(args[1]);
 
 	char **scripts = (char **)malloc(sizeof(char *) * size);
 	void **script_val = metacall_value_to_array(args[1]);
-	for (int i = 0; i < size; ++i)
+	if (scripts == NULL || script_val == NULL)
+	{
+		return metacall_value_create_int(1);
+	}
+
+	for (size_t i = 0; i < size; ++i)
 	{
 		scripts[i] = metacall_value_to_string(script_val[i]);
 	}
@@ -105,12 +116,11 @@ void *await(size_t argc, void *args[], void *data)
 
 	await_cond.wait(lock);
 
+	return fdata.v;
 	/* Unused */
 	metacall_value_destroy(future);
 
 	metacall_allocator_destroy(allocator);
-
-	return fdata.v;
 }
 
 void *call(size_t argc, void *args[], void *data)
@@ -162,6 +172,7 @@ void *clear(size_t argc, void *args[], void *data)
 
 	if (handle == NULL)
 	{
+		log_write("metacall", LOG_LEVEL_DEBUG, "handle %s not found in loader (%s)", script, tag);
 		return metacall_value_create_int(1);
 	}
 
@@ -240,7 +251,7 @@ int core_plugin(void *loader, void *context)
 	}
 
 	{
-		enum metacall_value_id arg_types[] = { METACALL_STRING, METACALL_STRING };
+		enum metacall_value_id arg_types[] = { METACALL_STRING, METACALL_ARRAY };
 		if (metacall_register_loaderv(loader, context, "load", load, METACALL_INT, sizeof(arg_types) / sizeof(arg_types[0]), arg_types) != 0)
 		{
 			log_write("metacall", LOG_LEVEL_DEBUG, "Failed to register function: load");

source/tests/CMakeLists.txt

@@ -228,3 +228,4 @@ add_subdirectory(metacall_library_path_without_env_vars_test)
 add_subdirectory(metacall_ext_test)
 add_subdirectory(metacall_plugin_extension_test)
 add_subdirectory(metacall_plugin_extension_local_test)
+add_subdirectory(metacall_core_plugin_test)

source/tests/metacall_core_plugin_test/CMakeLists.txt

@@ -0,0 +1,156 @@
+# Check if this loader is enabled
+if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_EXT OR NOT OPTION_BUILD_LOADERS_NODE OR NOT OPTION_BUILD_LOADERS_PY OR  NOT OPTION_BUILD_SCRIPTS_EXT OR NOT OPTION_BUILD_SCRIPTS_NODE  OR NOT OPTION_BUILD_SCRIPTS_PY)
+	return()
+endif()
+
+#
+# Executable name and options
+#
+
+# Target name
+set(target metacall-core-plugin-test)
+message(STATUS "Test ${target}")
+
+#
+# Compiler warnings
+#
+
+include(Warnings)
+
+#
+# Compiler security
+#
+
+include(SecurityFlags)
+
+#
+# Sources
+#
+
+set(include_path "${CMAKE_CURRENT_SOURCE_DIR}/include/${target}")
+set(source_path  "${CMAKE_CURRENT_SOURCE_DIR}/source")
+
+set(sources
+	${source_path}/main.cpp
+	${source_path}/metacall_core_plugin_test.cpp
+)
+
+# Group source files
+set(header_group "Header Files (API)")
+set(source_group "Source Files")
+source_group_by_path(${include_path} "\\\\.h$|\\\\.hpp$"
+	${header_group} ${headers})
+source_group_by_path(${source_path}  "\\\\.cpp$|\\\\.c$|\\\\.h$|\\\\.hpp$"
+	${source_group} ${sources})
+
+#
+# Create executable
+#
+
+# Build executable
+add_executable(${target}
+	${sources}
+)
+
+# Create namespaced alias
+add_executable(${META_PROJECT_NAME}::${target} ALIAS ${target})
+
+#
+# Project options
+#
+
+set_target_properties(${target}
+	PROPERTIES
+	${DEFAULT_PROJECT_OPTIONS}
+	FOLDER "${IDE_FOLDER}"
+)
+
+#
+# Include directories
+#
+
+target_include_directories(${target}
+	PRIVATE
+	${DEFAULT_INCLUDE_DIRECTORIES}
+	${PROJECT_BINARY_DIR}/source/include
+)
+
+#
+# Libraries
+#
+
+target_link_libraries(${target}
+	PRIVATE
+	${DEFAULT_LIBRARIES}
+
+	GTest
+
+	${META_PROJECT_NAME}::metacall
+)
+
+#
+# Compile definitions
+#
+
+target_compile_definitions(${target}
+	PRIVATE
+	${DEFAULT_COMPILE_DEFINITIONS}
+)
+
+#
+# Compile options
+#
+
+target_compile_options(${target}
+	PRIVATE
+	${DEFAULT_COMPILE_OPTIONS}
+)
+
+#
+#Define Macros
+#
+
+add_compile_definitions(CORE_PLUGIN_PATH="${PROJECT_OUTPUT_DIR}/plugins/core_plugin/metacall-core_plugin.json")
+
+#
+# Linker options
+#
+
+target_link_libraries(${target}
+	PRIVATE
+	${DEFAULT_LINKER_OPTIONS}
+)
+
+#
+# Define test
+#
+
+add_test(NAME ${target}
+	COMMAND $<TARGET_FILE:${target}>
+)
+
+#
+# Define dependencies
+#
+
+add_dependencies(${target}
+	ext_loader
+	node_loader
+	py_loader
+	core_plugin
+)
+
+#
+# Define test properties
+#
+
+set_property(TEST ${target}
+	PROPERTY LABELS ${target}
+)
+
+include(TestEnvironmentVariables)
+
+test_environment_variables(${target}
+	""
+	${TESTS_ENVIRONMENT_VARIABLES}
+)

source/tests/metacall_core_plugin_test/source/main.cpp

@@ -0,0 +1,28 @@
+/*
+ *	Loader Library by Parra Studios
+ *	A plugin for loading ruby code at run-time into a process.
+ *
+ *	Copyright (C) 2016 - 2022 Vicente Eduardo Ferrer Garcia <[email protected]>
+ *
+ *	Licensed under the Apache License, Version 2.0 (the "License");
+ *	you may not use this file except in compliance with the License.
+ *	You may obtain a copy of the License at
+ *
+ *		http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *	Unless required by applicable law or agreed to in writing, software
+ *	distributed under the License is distributed on an "AS IS" BASIS,
+ *	WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *	See the License for the specific language governing permissions and
+ *	limitations under the License.
+ *
+ */
+
+#include <gtest/gtest.h>
+
+int main(int argc, char *argv[])
+{
+	::testing::InitGoogleTest(&argc, argv);
+
+	return RUN_ALL_TESTS();
+}