From: Aleksey Kliger <aleksey@xamarin.com>
Date: Tue, 31 May 2016 19:03:03 +0000 (-0400)
Subject: [coop] Disable profiler tests if coop is enabled
X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=commitdiff_plain;h=830f7eec99847ae125a10a3a3673c79e5866b60e;p=mono.git

[coop] Disable profiler tests if coop is enabled
---

diff --git a/mono/profiler/Makefile.am b/mono/profiler/Makefile.am
index 75b2348e53c..41e62a8a1b5 100644
--- a/mono/profiler/Makefile.am
+++ b/mono/profiler/Makefile.am
@@ -84,6 +84,10 @@ endif
 mprof_report_SOURCES = decode.c
 mprof_report_LDADD = $(Z_LIBS) $(GLIB_LIBS) $(LIBICONV)
 
+# FIXME fix the profiler tests to work with coop.
+if ENABLE_COOP
+DISABLE_PROFILER_TESTS=1
+endif
 PLOG_TESTS_SRC=test-alloc.cs test-busy.cs test-monitor.cs test-excleave.cs \
 	test-heapshot.cs test-traces.cs
 PLOG_TESTS=$(PLOG_TESTS_SRC:.cs=.exe)
@@ -99,7 +103,12 @@ MCS = $(RUNTIME) $(mcs_topdir)/class/lib/build/mcs.exe -unsafe -nowarn:0162 -now
 	$(MCS) -out:$@ $<
 
 testlog: $(PLOG_TESTS)
-	$(with_mono_path) perl $(srcdir)/ptestrunner.pl $(top_builddir)
+	if [ "z$(DISABLE_PROFILER_TESTS)" != z1 ]; then \
+		$(with_mono_path) perl $(srcdir)/ptestrunner.pl $(top_builddir) ; \
+	else \
+		echo "Profiler tests disabled with cooperative GC" ; \
+	fi
+
 
 if NACL_CODEGEN
 check-local: