From: Alexander Kyte <alexmkyte@gmail.com>
Date: Wed, 27 Jan 2016 20:09:29 +0000 (-0500)
Subject: Merge pull request #2431 from alexanderkyte/tests_with_excludes
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=1f5d985270df9390f9cb558656763ea428c14e2c;p=mono.git

Merge pull request #2431 from alexanderkyte/tests_with_excludes

[mcs] Fix .sources/.excludes for tests, exclude corlib monotouch-excluded tests on mobile_static
---

1f5d985270df9390f9cb558656763ea428c14e2c
diff --cc mcs/build/rules.make
index 88170948f67,fdc3fa96f28..966351c446b
--- a/mcs/build/rules.make
+++ b/mcs/build/rules.make
@@@ -112,16 -113,15 +113,23 @@@ PROFILE = $(DEFAULT_PROFILE
  endif
  
  include $(topdir)/build/profiles/$(PROFILE).make
- -include $(topdir)/build/config.make
+ 
+ # If the profile is using nunit-lite, use it
+ ifdef NUNIT_LITE
+ TEST_HARNESS=$(topdir)/class/lib/$(PROFILE)/nunit-lite-console.exe
+ endif
+ 
+ # Make sure propagates
+ export TEST_HARNESS
  
 +# If the profile is using nunit-lite, use it
 +ifdef NUNIT_LITE
 +TEST_HARNESS=$(topdir)/class/lib/$(PROFILE)/nunit-lite-console.exe
 +endif
 +
 +# Make sure propagates
 +export TEST_HARNESS
 +
  ifdef BCL_OPTIMIZE
  PROFILE_MCS_FLAGS += -optimize
  endif
diff --cc mcs/build/tests.make
index f44e0574c96,36ff336f5ae..82fa11f0035
--- a/mcs/build/tests.make
+++ b/mcs/build/tests.make
@@@ -72,19 -81,19 +81,29 @@@ test-local: $(test_assemblies
  run-test-local: run-test-lib
  run-test-ondotnet-local: run-test-ondotnet-lib
  
- TEST_HARNESS_EXCLUDES = -exclude=$(PLATFORM_TEST_HARNESS_EXCLUDES)NotWorking,ValueAdd,CAS,InetAccess
- TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:$(PLATFORM_TEST_HARNESS_EXCLUDES)NotDotNet,CAS
+ TEST_HARNESS_EXCLUDES = -exclude=$(PLATFORM_TEST_HARNESS_EXCLUDES)$(PROFILE_TEST_HARNESS_EXCLUDES)NotWorking,ValueAdd,CAS,InetAccess
+ TEST_HARNESS_EXCLUDES_ONDOTNET = /exclude:$(PLATFORM_TEST_HARNESS_EXCLUDES)$(PROFILE_TEST_HARNESS_EXCLUDES)NotDotNet,CAS
+ 
+ ifdef NUNIT_LITE
+ NOSHADOW_FLAG =
+ NUNIT_XML_FLAG = -format:nunit2 -result:
+ OUTPUT_FILE_FLAG=-out
+ else
+ OUTPUT_FILE_FLAG=-output
+ NOSHADOW_FLAG = -noshadow
+ NUNIT_XML_FLAG = -xml=
+ endif
  
 +ifdef NUNIT_LITE
 +NOSHADOW_FLAG =
 +NUNIT_XML_FLAG = -format:nunit2 -result:
 +OUTPUT_FILE_FLAG=-out
 +else
 +OUTPUT_FILE_FLAG=-output
 +NOSHADOW_FLAG = -noshadow
 +NUNIT_XML_FLAG = -xml=
 +endif
 +
  ifdef TEST_HARNESS_VERBOSE
  TEST_HARNESS_OUTPUT = -labels
  TEST_HARNESS_OUTPUT_ONDOTNET = -labels