[profiler] Don't run the test suite when the profiler is disabled.

[mono.git] / mono / profiler / Makefile.am

diff --git a/mono/profiler/Makefile.am b/mono/profiler/Makefile.am
index 41e62a8a1b528645239bdbadc8502e1d9cec55de..3c1e2b7b56982113bee25bb7a644affb0c846851 100644 (file)
--- a/mono/profiler/Makefile.am
+++ b/mono/profiler/Makefile.am
@@ -44,6 +44,13 @@ if PLATFORM_ANDROID
 prof_ldflags = -avoid-version
 endif
 
+# FIXME fix the profiler tests to work with coop.
+if !ENABLE_COOP
+if !NACL_CODEGEN
+check_targets = testlog
+endif
+endif
+
 endif
 endif
 endif
@@ -84,10 +91,6 @@ 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)
@@ -103,18 +106,9 @@ MCS = $(RUNTIME) $(mcs_topdir)/class/lib/build/mcs.exe -unsafe -nowarn:0162 -now
        $(MCS) -out:$@ $<
 
 testlog: $(PLOG_TESTS)
-       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
-
+       $(with_mono_path) perl $(srcdir)/ptestrunner.pl $(top_builddir)
 
-if NACL_CODEGEN
-check-local:
-else
-check-local: testlog
-endif
+check-local: $(check_targets)
 
 suppressiondir = $(datadir)/mono-$(API_VER)/mono/profiler
 suppression_DATA = mono-profiler-log.suppression