Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/mono.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Köplinger <alex.koeplinger@outlook.com>2018-11-27 15:45:40 +0300
committerAlexander Köplinger <alex.koeplinger@outlook.com>2018-11-27 15:46:23 +0300
commit1f6c9272fe1efe5a7125cd60bf8527018c588b69 (patch)
tree98a67095451984742ba3b52f80df8516ab8670ab /acceptance-tests/Makefile.am
parent0de674c2dcc7ce937069872605bb6cceccfd5bdd (diff)
Revert "[runtime] Integrate BenchmarkDotNet for in-tree microbenchmarks (#9833)"
This reverts commit e15b8c53ffc24d2c0cc1438498c23c6461d0c6e0. It broke other builds. Revert "[bench] Revert hardcoding of microbenchmarks to run-jenkins (#11787)" This reverts commit 7a81ac67a2cf23a8b87e2e4366a9767dced3caa5.
Diffstat (limited to 'acceptance-tests/Makefile.am')
-rw-r--r--acceptance-tests/Makefile.am4
1 files changed, 1 insertions, 3 deletions
diff --git a/acceptance-tests/Makefile.am b/acceptance-tests/Makefile.am
index ef10f15c7e8..95ad60584c6 100644
--- a/acceptance-tests/Makefile.am
+++ b/acceptance-tests/Makefile.am
@@ -3,10 +3,9 @@ BENCHMARKER_PATH=$(ACCEPTANCE_TESTS_PATH)/benchmarker
ROSLYN_PATH=$(ACCEPTANCE_TESTS_PATH)/roslyn
CORECLR_PATH=$(ACCEPTANCE_TESTS_PATH)/coreclr
MSTESTSUITE_PATH=$(ACCEPTANCE_TESTS_PATH)/ms-test-suite
-DEBIANSHOOTOUTMONO_PATH=$(ACCEPTANCE_TESTS_PATH)/DebianShootoutMono
CLEANFILES = *.dll *.exe *.mdb
-EXTRA_DIST=README.md SUBMODULES.json microbench.mk versions.mk profiler-stress.mk roslyn.mk coreclr.mk ms-test-suite.mk
+EXTRA_DIST=README.md SUBMODULES.json versions.mk profiler-stress.mk roslyn.mk coreclr.mk ms-test-suite.mk
CLASS=$(mcs_topdir)/class/lib/$(DEFAULT_PROFILE)
TOOLS_CLASS=$(mcs_topdir)/class/lib/build
@@ -18,7 +17,6 @@ ILASM = $(TOOLS_RUNTIME) $(TOOLS_CLASS)/ilasm.exe
XUNIT = $(RUNTIME) $(abs_top_builddir)/external/xunit-binaries/xunit.console.exe
include versions.mk
-include microbench.mk
include profiler-stress.mk
include roslyn.mk
include coreclr.mk