Merge branch 'master' into develop

viferga · viferga · commit 9ec4bc1cc121 · 2021-05-19T13:47:03.000+02:00
diff --git a/source/cli/metacallcli/CMakeLists.txt b/source/cli/metacallcli/CMakeLists.txt
@@ -399,7 +399,7 @@ if(OPTION_BUILD_LOADERS AND OPTION_BUILD_LOADERS_TS AND OPTION_BUILD_SCRIPTS AND
 
 	if(OPTION_BUILD_LOADERS_PY)
 		add_test(NAME ${target}-py-tsx
-			COMMAND ${TEST_COMMAND} "echo 'load py cli-test-tsx.py\nexit' | $<TARGET_FILE:${target}> | ${GREP_COMMAND} \"Hello metaprogrammer\""
+			COMMAND ${TEST_COMMAND} "echo 'load py cli-test-tsx.py\nexit' | $<TARGET_FILE:${target}> | ${GREP_COMMAND} \"Hello World\""
 			WORKING_DIRECTORY ${LOADER_SCRIPT_PATH}/templating
 		)
 		set_property(TEST ${target}-py-tsx

Original file line number	Diff line number	Diff line change
`@@ -399,7 +399,7 @@ if(OPTION_BUILD_LOADERS AND OPTION_BUILD_LOADERS_TS AND OPTION_BUILD_SCRIPTS AND`
`399`	`399`
`400`	`400`	`if(OPTION_BUILD_LOADERS_PY)`
`401`	`401`	`add_test(NAME ${target}-py-tsx`
`402`		`- COMMAND ${TEST_COMMAND} "echo 'load py cli-test-tsx.py\nexit' \| $<TARGET_FILE:${target}> \| ${GREP_COMMAND} \"Hello metaprogrammer\""`
	`402`	`+ COMMAND ${TEST_COMMAND} "echo 'load py cli-test-tsx.py\nexit' \| $<TARGET_FILE:${target}> \| ${GREP_COMMAND} \"Hello World\""`
`403`	`403`	`WORKING_DIRECTORY ${LOADER_SCRIPT_PATH}/templating`
`404`	`404`	`)`
`405`	`405`	`set_property(TEST ${target}-py-tsx`