Solve few test bugs and make rust tests optional in node and python.

Author: viferga

source/ports/node_port/CMakeLists.txt

@@ -123,9 +123,15 @@ if(OPTION_BUILD_LOADERS_C)
 	set(TESTS_ENVIRONMENT_VARIABLES_C "OPTION_BUILD_LOADERS_C=1")
 endif()
 
+# Enable rust test if it is built
+if(OPTION_BUILD_LOADERS_C)
+	set(TESTS_ENVIRONMENT_VARIABLES_RS "OPTION_BUILD_LOADERS_RS=1")
+endif()
+
 test_environment_variables(${target}
 	""
 	${TESTS_ENVIRONMENT_VARIABLES}
 	${TESTS_ENVIRONMENT_VARIABLES_COB}
 	${TESTS_ENVIRONMENT_VARIABLES_C}
+	${TESTS_ENVIRONMENT_VARIABLES_RS}
 )

source/ports/node_port/test/index.js

@@ -83,13 +83,15 @@ describe('metacall', () => {
 			assert.notStrictEqual(script, undefined);
 			assert.strictEqual(script.name, 'ducktype.rb');
 		});
-		it('metacall_load_from_file (rs)', () => {
-			assert.strictEqual(metacall_load_from_file('rs', ['basic.rs']), undefined);
+		if (process.env['OPTION_BUILD_LOADERS_RS']) {
+			it('metacall_load_from_file (rs)', () => {
+				assert.strictEqual(metacall_load_from_file('rs', ['basic.rs']), undefined);
 
-			const script = metacall_handle('rs', 'basic.rs');
-			assert.notStrictEqual(script, undefined);
-			assert.strictEqual(script.name, 'basic.rs');
-		});
+				const script = metacall_handle('rs', 'basic.rs');
+				assert.notStrictEqual(script, undefined);
+				assert.strictEqual(script.name, 'basic.rs');
+			});
+		}
 		it('metacall_load_from_memory (py)', () => {
 			assert.strictEqual(metacall_load_from_memory('py', 'def py_memory():\n\treturn 4;\n'), undefined);
 			assert.strictEqual(metacall('py_memory'), 4.0);
@@ -201,13 +203,15 @@ describe('metacall', () => {
 			assert.strictEqual(cache.cache_set('asd', 'efg'), undefined);
 			assert.strictEqual(cache.cache_get('asd'), 'efg');
 		});
-		it('require (rs)', () => {
-			const { new_string, add_vec2, add_float, return_vec } = require('./basic.rs');
-			assert.strictEqual(new_string(123), 'get number 123');
-			assert.strictEqual(add_vec2([1, 2, 3, 4]), 10);
-			assert.strictEqual(add_float(12, 23), 35);
-			assert.strictEqual(return_vec().reduce((partialSum, a) => partialSum + a, 0), 15);
-		});
+		if (process.env['OPTION_BUILD_LOADERS_RS']) {
+			it('require (rs)', () => {
+				const { new_string, add_vec2, add_float, return_vec } = require('./basic.rs');
+				assert.strictEqual(new_string(123), 'get number 123');
+				assert.strictEqual(add_vec2([1, 2, 3, 4]), 10);
+				assert.strictEqual(add_float(12, 23), 35);
+				assert.strictEqual(return_vec().reduce((partialSum, a) => partialSum + a, 0), 15);
+			});
+		}
 	});
 
 	describe('inspect', () => {
@@ -225,9 +229,11 @@ describe('metacall', () => {
 		it('metacall (rb)', () => {
 			assert.strictEqual(metacall('get_second', 5, 12), 12);
 		});
-		it('metacall (rs)', () => {
-			assert.strictEqual(metacall('add', 5, 12), 17);
-		});
+		if (process.env['OPTION_BUILD_LOADERS_RS']) {
+			it('metacall (rs)', () => {
+				assert.strictEqual(metacall('add', 5, 12), 17);
+			});
+		}
 	});
 
 	describe('callback', () => {

source/ports/py_port/CMakeLists.txt

@@ -60,7 +60,13 @@ set_property(TEST ${target}
 
 include(TestEnvironmentVariables)
 
+# Enable rust test if it is built
+if(OPTION_BUILD_LOADERS_C)
+	set(TESTS_ENVIRONMENT_VARIABLES_RS "OPTION_BUILD_LOADERS_RS=1")
+endif()
+
 test_environment_variables(${target}
 	""
 	${TESTS_ENVIRONMENT_VARIABLES}
+	${TESTS_ENVIRONMENT_VARIABLES_RS}
 )

source/ports/py_port/test/test_simple.py

@@ -96,7 +96,8 @@ def test_nodejs(self):
 
 	# MetaCall (Rust)
 	def test_rust(self):
-		print("running rust test")
+		if os.environ.get('OPTION_BUILD_LOADERS_RS') == None: return
+
 		from basic.rs import add, add_float, string_len, new_string
 
 		self.assertEqual(add(34, 22), 56)
@@ -118,8 +119,7 @@ def test_rust(self):
 fn new_string2(idx: i32) -> String {
     format!("get number {idx}")
 }
-
-		""")
+""")
 		self.assertEqual(metacall('new_string2', 5), 'get number 5')
 
 		# FIXME: println inside rust fails to log anything

source/tests/metacall_plugin_extension_local_test/source/metacall_plugin_extension_local_test.cpp

@@ -53,6 +53,8 @@ TEST_F(metacall_plugin_extension_local_test, DefaultConstructor)
 		EXPECT_EQ((enum metacall_value_id)METACALL_LONG, (enum metacall_value_id)metacall_value_id(ret));
 
 		EXPECT_EQ((long)6, (long)metacall_value_to_long(ret));
+
+		metacall_value_destroy(ret);
 	}
 
 	{
@@ -63,6 +65,8 @@ TEST_F(metacall_plugin_extension_local_test, DefaultConstructor)
 		EXPECT_EQ((enum metacall_value_id)METACALL_LONG, (enum metacall_value_id)metacall_value_id(ret));
 
 		EXPECT_EQ((long)7, (long)metacall_value_to_long(ret));
+
+		metacall_value_destroy(ret);
 	}
 #endif /* OPTION_BUILD_LOADERS_PY */
 
@@ -76,6 +80,8 @@ TEST_F(metacall_plugin_extension_local_test, DefaultConstructor)
 		EXPECT_EQ((enum metacall_value_id)METACALL_DOUBLE, (enum metacall_value_id)metacall_value_id(ret));
 
 		EXPECT_EQ((double)8.0, (double)metacall_value_to_double(ret));
+
+		metacall_value_destroy(ret);
 	}
 #endif /* OPTION_BUILD_LOADERS_NODE */
 

source/tests/metacall_plugin_extension_test/source/metacall_plugin_extension_test.cpp

@@ -51,6 +51,8 @@ TEST_F(metacall_plugin_extension_test, DefaultConstructor)
 		EXPECT_EQ((enum metacall_value_id)METACALL_LONG, (enum metacall_value_id)metacall_value_id(ret));
 
 		EXPECT_EQ((long)6, (long)metacall_value_to_long(ret));
+
+		metacall_value_destroy(ret);
 	}
 
 	{
@@ -61,6 +63,8 @@ TEST_F(metacall_plugin_extension_test, DefaultConstructor)
 		EXPECT_EQ((enum metacall_value_id)METACALL_LONG, (enum metacall_value_id)metacall_value_id(ret));
 
 		EXPECT_EQ((long)7, (long)metacall_value_to_long(ret));
+
+		metacall_value_destroy(ret);
 	}
 #endif /* OPTION_BUILD_LOADERS_PY */
 
@@ -74,6 +78,8 @@ TEST_F(metacall_plugin_extension_test, DefaultConstructor)
 		EXPECT_EQ((enum metacall_value_id)METACALL_DOUBLE, (enum metacall_value_id)metacall_value_id(ret));
 
 		EXPECT_EQ((double)8.0, (double)metacall_value_to_double(ret));
+
+		metacall_value_destroy(ret);
 	}
 #endif /* OPTION_BUILD_LOADERS_NODE */