Renamed wasm tests, improve event loop closing algorithm from node loader, trying to solve a broken index in git related to java scripts folder (Fibonnaci).

Author: viferga

source/loaders/node_loader/source/node_loader_impl.cpp

@@ -4707,8 +4707,11 @@ void node_loader_impl_walk_async_handles_count(uv_handle_t *handle, void *arg)
 
 	if (uv_is_active(handle) && !uv_is_closing(handle))
 	{
-		// TODO: Improve counter for timers and timeouts, in order to close the event loop properly
-		if (!(handle->type == UV_TIMER && !uv_has_ref(handle)))
+		// NOTE: I am not sure if this check for timers is correct, at least for versions
+		// previous from v11.0.0. Now the node loader seems to be working for versions >=v12.
+		// If there is any other error when closing, improve counter for timers and timeouts.
+		// Signals have been added because they do not prevent the event loop from closing.
+		if (/*(!(handle->type == UV_TIMER && !uv_has_ref(handle))) ||*/ handle->type != UV_SIGNAL)
 		{
 			(*async_count)++;
 		}

source/scripts/java/fibonacci/source/fibonacci.java

@@ -122,6 +122,7 @@ add_subdirectory(metacall_handle_get_test)
 add_subdirectory(metacall_test)
 add_subdirectory(metacall_node_test)
 add_subdirectory(metacall_node_event_loop_test)
+add_subdirectory(metacall_node_event_loop_signal_test)
 #add_subdirectory(metacall_node_default_export_test) # TODO: This is a feature in order to export by default all functions if there is no module.exports (bootstrap.js)
 add_subdirectory(metacall_node_call_test)
 add_subdirectory(metacall_node_inline_test)
@@ -200,5 +201,5 @@ add_subdirectory(metacall_ruby_test)
 add_subdirectory(metacall_cs_test)
 add_subdirectory(metacall_julia_test)
 add_subdirectory(metacall_java_test)
-add_subdirectory(wasm_loader_test)
-add_subdirectory(wasm_python_port_test)
+add_subdirectory(metacall_wasm_loader_test)
+add_subdirectory(metacall_wasm_python_port_test)

source/tests/CMakeLists.txt

@@ -0,0 +1,147 @@
+# Check if this loader is enabled
+if(NOT OPTION_BUILD_LOADERS OR NOT OPTION_BUILD_LOADERS_NODE)
+	return()
+endif()
+
+#
+# Executable name and options
+#
+
+# Target name
+set(target metacall-node-event-loop-signal-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_node_event_loop_signal_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}
+)
+
+#
+# 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}
+	node_loader
+)
+
+#
+# Define test properties
+#
+
+set_property(TEST ${target}
+	PROPERTY LABELS ${target}
+)
+
+include(TestEnvironmentVariables)
+
+test_environment_variables(${target}
+	""
+	${TESTS_ENVIRONMENT_VARIABLES}
+)

source/tests/metacall_node_event_loop_signal_test/CMakeLists.txt

@@ -0,0 +1,28 @@
+/*
+ *	MetaCall Library by Parra Studios
+ *	A library for providing a foreign function interface calls.
+ *
+ *	Copyright (C) 2016 - 2021 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();
+}

source/tests/metacall_node_event_loop_signal_test/source/main.cpp

@@ -0,0 +1,58 @@
+/*
+ *	MetaCall Library by Parra Studios
+ *	A library for providing a foreign function interface calls.
+ *
+ *	Copyright (C) 2016 - 2021 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>
+
+#include <metacall/metacall.h>
+#include <metacall/metacall_loaders.h>
+#include <metacall/metacall_value.h>
+
+class metacall_node_event_loop_signal_test : public testing::Test
+{
+public:
+};
+
+TEST_F(metacall_node_event_loop_signal_test, DefaultConstructor)
+{
+	metacall_print_info();
+
+	metacall_log_null();
+
+	ASSERT_EQ((int)0, (int)metacall_initialize());
+
+/* NodeJS */
+#if defined(OPTION_BUILD_LOADERS_NODE)
+	{
+		// This test verifies that signals do not prevent event loop from exiting
+		const char buffer[] =
+			"process.on('SIGINT', () => { console.log('SIGINT') });\n";
+
+		void *handle = NULL;
+
+		EXPECT_EQ((int)0, (int)metacall_load_from_memory("node", buffer, sizeof(buffer), &handle));
+
+		EXPECT_NE((void *)NULL, (void *)handle);
+
+		EXPECT_EQ((int)0, (int)metacall_clear(handle));
+	}
+#endif /* OPTION_BUILD_LOADERS_NODE */
+
+	EXPECT_EQ((int)0, (int)metacall_destroy());
+}

source/tests/metacall_node_event_loop_signal_test/source/metacall_node_event_loop_signal_test.cpp

@@ -8,7 +8,7 @@ endif()
 #
 
 # Target name
-set(target wasm-loader-test)
+set(target metacall-wasm-loader-test)
 message(STATUS "Test ${target}")
 
 #
@@ -32,7 +32,7 @@ set(source_path  "${CMAKE_CURRENT_SOURCE_DIR}/source")
 
 set(sources
 	${source_path}/main.cpp
-	${source_path}/wasm_loader_test.cpp
+	${source_path}/metacall_wasm_loader_test.cpp
 )
 
 # Group source files

source/tests/wasm_loader_test/CMakeLists.txt renamed to source/tests/metacall_wasm_loader_test/CMakeLists.txt

@@ -22,7 +22,7 @@
 #include <metacall/metacall.h>
 #include <metacall/metacall_value.h>
 
-class wasm_loader_test : public testing::Test
+class metacall_wasm_loader_test : public testing::Test
 {
 protected:
 	void SetUp() override
@@ -56,7 +56,7 @@ void TestFunction(void *handle, const char *name, const std::vector<enum metacal
 	ASSERT_EQ(expected_return_type, return_type);
 }
 
-TEST_F(wasm_loader_test, InitializeAndDestroy)
+TEST_F(metacall_wasm_loader_test, InitializeAndDestroy)
 {
 	// This is extremely hacky and causes an error when loading the buffer,
 	// since it is invalid. However, it is currently impossible to initialize a
@@ -72,7 +72,7 @@ TEST_F(wasm_loader_test, InitializeAndDestroy)
 	ASSERT_EQ(0, metacall_destroy());
 }
 
-TEST_F(wasm_loader_test, LoadBinaryFromMemory)
+TEST_F(metacall_wasm_loader_test, LoadBinaryFromMemory)
 {
 	// See https://webassembly.github.io/spec/core/binary/modules.html#binary-module
 	const char empty_module[] = {
@@ -85,7 +85,7 @@ TEST_F(wasm_loader_test, LoadBinaryFromMemory)
 	ASSERT_NE(0, metacall_load_from_memory("wasm", invalid_module, sizeof(invalid_module), NULL));
 }
 
-TEST_F(wasm_loader_test, LoadTextFromMemory)
+TEST_F(metacall_wasm_loader_test, LoadTextFromMemory)
 {
 	const char *empty_module = "(module)";
 	ASSERT_EQ(0, metacall_load_from_memory("wasm", empty_module, strlen(empty_module), NULL));
@@ -95,7 +95,7 @@ TEST_F(wasm_loader_test, LoadTextFromMemory)
 }
 
 #if defined(BUILD_SCRIPT_TESTS)
-TEST_F(wasm_loader_test, LoadFromFile)
+TEST_F(metacall_wasm_loader_test, LoadFromFile)
 {
 	const char *empty_module_filename = "empty_module.wat";
 	const char *invalid_module_filename = "invalid_module.wat";
@@ -104,13 +104,13 @@ TEST_F(wasm_loader_test, LoadFromFile)
 	ASSERT_NE(0, metacall_load_from_file("wasm", &invalid_module_filename, 1, NULL));
 }
 
-TEST_F(wasm_loader_test, LoadFromPackage)
+TEST_F(metacall_wasm_loader_test, LoadFromPackage)
 {
 	ASSERT_EQ(0, metacall_load_from_package("wasm", "empty_module.wasm", NULL));
 	ASSERT_NE(0, metacall_load_from_package("wasm", "invalid_module.wasm", NULL));
 }
 
-TEST_F(wasm_loader_test, DiscoverFunctions)
+TEST_F(metacall_wasm_loader_test, DiscoverFunctions)
 {
 	const char *functions_module_filename = "functions.wat";
 	void *handle;
@@ -128,7 +128,7 @@ TEST_F(wasm_loader_test, DiscoverFunctions)
 	TestFunction(handle, "i32_f32_i64_f64_ret_i32_f32_i64_f64", { METACALL_INT, METACALL_FLOAT, METACALL_LONG, METACALL_DOUBLE }, METACALL_ARRAY);
 }
 
-TEST_F(wasm_loader_test, CallFunctions)
+TEST_F(metacall_wasm_loader_test, CallFunctions)
 {
 	const char *functions_module_filename = "functions.wat";
 
@@ -181,7 +181,7 @@ TEST_F(wasm_loader_test, CallFunctions)
 	ASSERT_EQ(NULL, ret);
 }
 
-TEST_F(wasm_loader_test, LinkModules)
+TEST_F(metacall_wasm_loader_test, LinkModules)
 {
 	const char *modules[] = {
 		"exports1.wat",
@@ -202,7 +202,7 @@ TEST_F(wasm_loader_test, LinkModules)
 	metacall_value_destroy(ret);
 }
 
-TEST_F(wasm_loader_test, InvalidLinkModules)
+TEST_F(metacall_wasm_loader_test, InvalidLinkModules)
 {
 	const char *modules[] = {
 		"exports1.wat",