diff options
| author | Marek Habersack <grendel@twistedcode.net> | 2009-11-18 01:15:40 +0300 |
|---|---|---|
| committer | Marek Habersack <grendel@twistedcode.net> | 2009-11-18 01:15:40 +0300 |
| commit | 035c90b4c4e17b56f57ee6ec4e42407ec95f974d (patch) | |
| tree | a04924b7a273931ad19ef789aab94da0010330bd /mcs/build | |
| parent | 3f61068a5cece762bcdca9ef7e0fd05d942550fc (diff) | |
2009-11-17 Marek Habersack <mhabersack@novell.com>
* tests.make (TEST_RUNTIME_WRAPPERS_PATH): added - used to set up
correct PATH for tests
svn path=/branches/mono-2-6/mcs/; revision=146379
Diffstat (limited to 'mcs/build')
| -rw-r--r-- | mcs/build/ChangeLog | 5 | ||||
| -rw-r--r-- | mcs/build/tests.make | 4 |
2 files changed, 8 insertions, 1 deletions
diff --git a/mcs/build/ChangeLog b/mcs/build/ChangeLog index fa06b7c25cb..944f37b308b 100644 --- a/mcs/build/ChangeLog +++ b/mcs/build/ChangeLog @@ -1,3 +1,8 @@ +2009-11-17 Marek Habersack <mhabersack@novell.com> + + * tests.make (TEST_RUNTIME_WRAPPERS_PATH): added - used to set up + correct PATH for tests + 2008-09-11 Marek Safar <marek.safar@gmail.com> * library.make: Add NO_BUILD to ignore assembly during build. diff --git a/mcs/build/tests.make b/mcs/build/tests.make index 0c5cd1338ea..98e1eb8d3d0 100644 --- a/mcs/build/tests.make +++ b/mcs/build/tests.make @@ -14,6 +14,8 @@ ifndef TEST_COMPILE TEST_COMPILE = $(CSCOMPILE) endif +TEST_RUNTIME_WRAPPERS_PATH = $(shell dirname $(RUNTIME))/_tmpinst/bin + ## Unit test support ifndef NO_TEST test_nunit_lib = nunit.framework.dll nunit.core.dll nunit.util.dll nunit.mocks.dll @@ -82,7 +84,7 @@ endif ## FIXME: i18n problem in the 'sed' command below run-test-lib: test-local ok=:; \ - MONO_REGISTRY_PATH="$(HOME)/.mono/registry" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) $(test_assemblies) -noshadow $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(TEST_HARNESS_OUTPUT) -xml=TestResult-$(PROFILE).xml $(FIXTURE_ARG) $(TESTNAME_ARG)|| ok=false; \ + PATH="$(TEST_RUNTIME_WRAPPERS_PATH):$(PATH)" MONO_REGISTRY_PATH="$(HOME)/.mono/registry" $(TEST_RUNTIME) $(RUNTIME_FLAGS) $(TEST_HARNESS) $(test_assemblies) -noshadow $(TEST_HARNESS_FLAGS) $(LOCAL_TEST_HARNESS_FLAGS) $(TEST_HARNESS_EXCLUDES) $(TEST_HARNESS_OUTPUT) -xml=TestResult-$(PROFILE).xml $(FIXTURE_ARG) $(TESTNAME_ARG)|| ok=false; \ $(TEST_HARNESS_POSTPROC) ; $$ok run-test-ondotnet-lib: test-local |