From f648656cc12e270e8ac350ebe2036161f91481c7 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Fri, 28 Aug 2015 21:18:58 -0700 Subject: [PATCH 1/2] Refactor test targets --- scripts/Makefile | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/scripts/Makefile b/scripts/Makefile index 1f49d7d91..723e453f3 100644 --- a/scripts/Makefile +++ b/scripts/Makefile @@ -181,20 +181,27 @@ run-interactive: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-relea run-file: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr exec_env/app_base/runps.sh --file $(PSSCRIPT) -pester-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr - # execute the pester tests, pester needs a TEMP environment variable to be set - exec_env/app_base/runps-simple.sh 'cd ../../../src/pester-tests; $$env:TEMP="/tmp"; invoke-pester' - -test: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr $(addprefix $(TESTRUN_FOLDER)/, ps_test.dll xunit.console.netcore.exe xunit.runner.utility.dll xunit.abstractions.dll xunit.execution.dll) pester-tests dotnetlibs/monad_native - cd exec_env/app_base && PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=../coreclr:. ../coreclr/corerun xunit.console.netcore.exe ps_test.dll -xml ../../xunittests.xml - # run the c++ tests - cd dotnetlibs && ./monad_native - # test the 3rdparty/hashbang sample - PATH=$(PATH):$(shell pwd)/exec_env/app_base $(shell pwd)/3rdparty/hashbang/script.ps1 - run-debugclr: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-debug-clr PAL_DBG_CHANNELS="+LOADER.TRACE" exec_env/app_base/runps-simple.sh get-location +native-tests: dotnetlibs/monad_native + # execute the native C++ tests + cd dotnetlibs && ./monad_native + +xunit-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr $(addprefix $(TESTRUN_FOLDER)/, ps_test.dll xunit.console.netcore.exe xunit.runner.utility.dll xunit.abstractions.dll xunit.execution.dll) + # execute the xUnit runner, with XML output + cd exec_env/app_base && PSMODULEPATH=$(shell pwd)/exec_env/app_base/Modules LD_LIBRARY_PATH=../coreclr:. ../coreclr/corerun xunit.console.netcore.exe ps_test.dll -xml ../../xunittests.xml + +pester-tests: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr + # execute the Pester tests, which needs a TEMP environment variable to be set + exec_env/app_base/runps-simple.sh 'cd ../../../src/pester-tests; $$env:TEMP="/tmp"; invoke-pester' + +hashbang-tests: + # execute the 3rdparty/hashbang example + PATH=$(PATH):$(shell pwd)/exec_env/app_base $(shell pwd)/3rdparty/hashbang/script.ps1 + +test: native-tests xunit-tests pester-tests hashbang-tests + trace: $(RUN_TARGETS) internal-prepare-exec_env internal-prepare-release-clr exec_env/app_base/runps-simple-trace.sh get-location From 70466f963c95ba7e1da79178a16e512685890831 Mon Sep 17 00:00:00 2001 From: Andrew Schwartzmeyer Date: Mon, 31 Aug 2015 12:55:43 -0700 Subject: [PATCH 2/2] Repin monad and monad-native - GetCpInfo fixes monad-native compiler warning - monad has more fixes --- src/monad | 2 +- src/monad-native | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/monad b/src/monad index 8e014f44d..d541b0734 160000 --- a/src/monad +++ b/src/monad @@ -1 +1 @@ -Subproject commit 8e014f44d72765f086fe516e870602d5a476076e +Subproject commit d541b073435e55fd96771697e5549cc9a188fa54 diff --git a/src/monad-native b/src/monad-native index 440cf6a23..5693da6a4 160000 --- a/src/monad-native +++ b/src/monad-native @@ -1 +1 @@ -Subproject commit 440cf6a236067eba2d5dcfd5e3707a36295cee97 +Subproject commit 5693da6a46e8c4d63a49a6dbc6be3081ce7d0d08