diff --git a/.gitignore b/.gitignore index 612fd5995c..16092215a9 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,6 @@ CMakeFiles/ Makefile !scripts/Makefile cmake_install.cmake -scripts/*tests.xml +scripts/*-tests.xml scripts/powershell.inc .bash_history diff --git a/scripts/Makefile b/scripts/Makefile index 71efdf7f77..6eb73e3427 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -116,9 +116,10 @@ $(addprefix dotnetlibs/, $(NATIVE_BINARIES)): $(LIBPS_BUILD)/Makefile mkdir -p dotnetlibs cp $(addprefix $(LIBPS_BUILD)/, $(notdir $@)) dotnetlibs -# C++ tests for monad-native +# C++ tests for monad-native - results in native-tests.xml +# see https://github.com/google/googletest native-tests: dotnetlibs/monad_native - cd dotnetlibs && ./monad_native --gtest_output="xml:../nativetests.xml" + cd dotnetlibs && ./monad_native --gtest_output="xml:../native-tests.xml" # this is a windows dll that is needed because CoreCLR tries to access # registry functions that don't exist on Linux and there is no other good @@ -190,7 +191,8 @@ run-file: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-clr run-debugclr: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-clr PAL_DBG_CHANNELS="+LOADER.TRACE" $(APP_BASE)/runps-simple.sh get-location -# xUnit tests +# xUnit tests for PowerShell - results in xunit-tests.xml +# see https://xunit.github.io/ TEST_FOLDER=../src/ps_test TEST_SRCS=$(addprefix $(TEST_FOLDER)/, test_*.cs) @@ -201,12 +203,13 @@ $(APP_BASE)/ps_test.dll: prepare $(TEST_SRCS) $(addprefix $(APP_BASE)/, xunit.co $(CSC) $(CSCOPTS_LIB) -out:$@ $(addprefix -r:$(APP_BASE)/, xunit.core.dll xunit.assert.dll) $(addprefix -r:dotnetlibs/, System.Management.Automation.dll $(ASSEMBLY_LOAD_CONTEXT_TARGET)) $(COREREF) $(TEST_SRCS) xunit-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-clr $(addprefix $(APP_BASE)/, ps_test.dll xunit.console.netcore.exe xunit.runner.utility.dll xunit.abstractions.dll xunit.execution.dll) - # execute the xUnit runner, with XML output - $(APP_BASE)/runps-test.sh ps_test.dll -xml ../../xunittests.xml + $(APP_BASE)/runps-test.sh ps_test.dll -xml ../../xunit-tests.xml +# Pester tests for PowerShell - results in pester-tests.xml +# see https://github.com/pester/Pester +# requires $TEMP to be set pester-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-clr - # execute the Pester tests, which needs a TEMP environment variable to be set - $(APP_BASE)/runps-simple.sh 'cd ../../../src/pester-tests; $$env:TEMP="/tmp"; invoke-pester -OutputFile ../../scripts/pestertests.xml -OutputFormat NUnitXml' + $(APP_BASE)/runps-simple.sh 'cd ../../../src/pester-tests; $$env:TEMP="/tmp"; invoke-pester -OutputFile ../../scripts/pester-tests.xml -OutputFormat NUnitXml' hashbang-tests: all # execute the 3rdparty/hashbang example