projects
/
mono.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Merge branch 'master' of https://github.com/mono/mono"
[mono.git]
/
mono
/
tests
/
Makefile.am
diff --git
a/mono/tests/Makefile.am
b/mono/tests/Makefile.am
index ef9c61cbeeb30ed5642bc89fa1f644f3aa971d06..96f0d0e6a860ad59f14c00457b5caa5ad22ab70e 100644
(file)
--- a/
mono/tests/Makefile.am
+++ b/
mono/tests/Makefile.am
@@
-914,12
+914,7
@@
SGEN_CONFIGURATIONS = \
"major=marksweep-conc|ms-conc" \
"major=marksweep-conc,minor=split|ms-conc-split" \
"minor=split|ms-split" \
"major=marksweep-conc|ms-conc" \
"major=marksweep-conc,minor=split|ms-conc-split" \
"minor=split|ms-split" \
- "minor=split,alloc-ratio=95|ms-split-95" \
- "|plain-clear-at-gc|clear-at-gc" \
- "major=marksweep-par|ms-par-clear-at-gc|clear-at-gc" \
- "major=marksweep-conc|ms-conc-clear-at-gc|clear-at-gc" \
- "minor=split|ms-split-clear-at-gc|clear-at-gc"
-
+ "minor=split,alloc-ratio=95|ms-split-95"
#FIXME We should move to use SGEN_CONFIGURATIONS once sgen supports trailling commas or its argument list.
SGEN_BRIDGE_CONFIGURATIONS = \
#FIXME We should move to use SGEN_CONFIGURATIONS once sgen supports trailling commas or its argument list.
SGEN_BRIDGE_CONFIGURATIONS = \
@@
-937,9
+932,8
@@
sgen-regular-tests: $(SGEN_TESTS)
for conf in $(SGEN_CONFIGURATIONS); do \
name=`echo $$conf | cut -d\| -f 2`; \
params=`echo $$conf | cut -d\| -f 1`; \
for conf in $(SGEN_CONFIGURATIONS); do \
name=`echo $$conf | cut -d\| -f 2`; \
params=`echo $$conf | cut -d\| -f 1`; \
- debug_opt=`echo $$conf | cut -d\| -f 3`; \
test_name="$${test}|$${name}"; \
test_name="$${test}|$${name}"; \
- if MONO_GC_PARAMS="$$params" MONO_ENV_OPTIONS="--gc=sgen"
MONO_GC_DEBUG="$$debug_opt" $(srcdir)/test-driver '$(with_mono_path) $(JITTEST_PROG_RUN)' $$test_name "$(DISABLED_TESTS_SGEN)" "$${dump_action}" $(RUNTIME_ARGS);
\
+ if MONO_GC_PARAMS="$$params" MONO_ENV_OPTIONS="--gc=sgen"
$(srcdir)/test-driver '$(with_mono_path) $(JITTEST_PROG_RUN)' $$test_name "$(DISABLED_TESTS_SGEN)" "$${dump_action}" $(RUNTIME_ARGS);
\
then \
passed=`expr $${passed} + 1`; \
else \
then \
passed=`expr $${passed} + 1`; \
else \