X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=acceptance-tests%2FMakefile.am;h=6d7395a5c564914ec4d4db60a9f0c40a6993d0eb;hb=73cda12003768c9b6bc6fb55ccc7984fd6637dca;hp=36967e824fb0ae496f47759aa336e4a5a2f0056b;hpb=8b10aac7533570a50a63e9716c39f0efd49b0be1;p=mono.git

diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am
index 36967e824fb..6d7395a5c56 100644
--- a/acceptance-tests/Makefile.am
+++ b/acceptance-tests/Makefile.am
@@ -29,6 +29,7 @@ check-ms-test-suite:
 check-roslyn:
 	@$(MAKE) validate-roslyn RESET_VERSIONS=1
 	@if [ -z $$PREFIX ]; then echo "You need to set PREFIX to the prefix of the Mono installation that should be used for testing Roslyn." && exit 1; fi
+	sed -i -e 's/\\4.5-api"/\\4.5"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml; \
 	export MSBuildExtensionsPath=$$PREFIX/lib/mono/xbuild; \
 	MONO_DOTNET_PORTABLE_DIR=$$PREFIX/lib/mono/xbuild-frameworks/.NETPortable/; \
 	MONO_NUGET_TARGETS_DIR=$$PREFIX/lib/mono/xbuild/Microsoft/NuGet/; \
@@ -46,13 +47,16 @@ check-roslyn:
 	cd $(ROSLYN_PATH); \
 	sed -i -e 'N; s/bootstrapArg=".*\n.*"/bootstrapArg=""/g' cibuild.sh; \
 	sed -i -e 's#-xml Binaries/\$$BUILD_CONFIGURATION/xUnitResults/#-nunit $(abs_top_builddir)/acceptance-tests/TestResult-#g' cibuild.sh; \
-	./cibuild.sh --mono-path $$PREFIX/bin
+	./cibuild.sh --mono-path $$PREFIX/bin; \
+	sed -i -e 's/\\4.5"/\\4.5-api"/g' $$PREFIX/lib/mono/xbuild-frameworks/.NETFramework/v4.5/RedistList/FrameworkList.xml;
 
 coreclr-validate:
 	$(MAKE) validate-coreclr RESET_VERSIONS=1
 
 coreclr-compile-tests: coreclr-validate
-	$(MAKE) -j4 $(CORECLR_TESTSI_CS) $(CORECLR_COREMANGLIB_TESTSI_CS) $(CORECLR_TESTSI_IL)
+	$(MAKE) -j4 $(CORECLR_TESTSI_CS)
+	$(MAKE) -j4 $(CORECLR_COREMANGLIB_TESTSI_CS)
+	$(MAKE) -j4 $(CORECLR_TESTSI_IL)
 
 # the CoreCLR IL tests use the System.Console facade, we need to copy it to the test directory
 # all the other tests rely on the coreclr-testlibrary.dll
@@ -293,6 +297,7 @@ CORECLR_TEST_CS_SRC=		\
 	$(CORECLR_PATH)/tests/src/JIT/Directed/coverage/oldtests/lclfldmul.cs	\
 	$(CORECLR_PATH)/tests/src/JIT/Directed/coverage/oldtests/lclfldrem.cs	\
 	$(CORECLR_PATH)/tests/src/JIT/Directed/coverage/oldtests/lclfldsub.cs	\
+	$(CORECLR_PATH)/tests/src/JIT/Directed/gettypetypeof/gettypetypeofmatrix.cs	\
 	$(CORECLR_PATH)/tests/src/JIT/Directed/intrinsic/interlocked/IntrinsicTest_Overflow.cs	\
 	$(CORECLR_PATH)/tests/src/JIT/Directed/intrinsic/interlocked/cmpxchg.cs	\
 	$(CORECLR_PATH)/tests/src/JIT/Directed/intrinsic/interlocked/cse_cmpxchg.cs	\
@@ -3794,7 +3799,12 @@ CORECLR_DISABLED_TEST_CS_SRC += 	\
 CORECLR_DISABLED_TEST_CS_SRC += 	\
 	$(CORECLR_PATH)/tests/src/Regressions/assemblyref/assem.cs	\
 	$(CORECLR_PATH)/tests/src/Regressions/assemblyref/test.cs		\
-	$(CORECLR_PATH)/tests/src/Interop/ReversePInvoke/Marshalling/MarshalBoolArray.cs
+	$(CORECLR_PATH)/tests/src/Interop/ReversePInvoke/Marshalling/MarshalBoolArray.cs	\
+	$(CORECLR_PATH)/tests/src/Interop/NativeCallable/NativeCallableTest.cs	\
+	$(CORECLR_PATH)/tests/src/JIT/Directed/StructABI/StructABI.OSX.cs	\
+	$(CORECLR_PATH)/tests/src/JIT/Directed/StructABI/StructABI.Windows.cs	\
+	$(CORECLR_PATH)/tests/src/JIT/Directed/StructABI/StructABI.Unix.cs	\
+	$(CORECLR_PATH)/tests/src/JIT/Directed/StructABI/StructABI.cs
 
 # relies on a define:
 CORECLR_DISABLED_TEST_CS_SRC += $(CORECLR_PATH)/tests/src/Exceptions/Finalization/Finalizer.cs
@@ -3846,6 +3856,9 @@ CORECLR_DISABLED_TEST_CS_SRC += 	\
 	$(CORECLR_PATH)/tests/src/CoreMangLib/cti/system/resources/resourcemanager/customculture.cs	\
 	$(CORECLR_PATH)/tests/src/CoreMangLib/system/resources/resourcemanager/customculture.cs
 
+# Mono doesn't support ICastable
+CORECLR_DISABLED_TEST_CS_SRC += $(CORECLR_PATH)/tests/src/Interop/ICastable/Castable.cs
+
 # throws IndexOutOfRange exception even on .NET
 CORECLR_DISABLED_TEST_CS_SRC += 	\
 	$(CORECLR_PATH)/tests/src/baseservices/threading/interlocked/compareexchange/compareexchangetclass.cs	\
@@ -5189,4 +5202,9 @@ test-runner.exe: $(top_srcdir)/mono/tests/test-runner.cs
 GCStressTests.exe: $(CORECLR_STRESSTEST_RUNNER_CS_SRC)
 	$(MCS) -out:$@ -debug -d:PROJECTK_BUILD $(CORECLR_STRESSTEST_RUNNER_CS_SRC)
 
-CLEANFILES = $(CORECLR_TESTSI_CS) $(CORECLR_COREMANGLIB_TESTSI_CS) $(CORECLR_TESTSI_IL) *.dll *.exe *.mdb $(CORECLR_STRESSTESTSI_CS) GCStressTests.exe coreclr-testlibrary.dll
+CLEANFILES = *.dll *.exe *.mdb $(CORECLR_STRESSTESTSI_CS) GCStressTests.exe coreclr-testlibrary.dll
+
+clean-local:
+	-rm -f $(CORECLR_TESTSI_CS)
+	-rm -f $(CORECLR_COREMANGLIB_TESTSI_CS)
+	-rm -f $(CORECLR_TESTSI_IL)
\ No newline at end of file