projects / mono.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: e142138 46717b4)
Merge pull request #4152 from BrzVlad/misc-gc-altstack
authorVlad Brezae <brezaevlad@gmail.com>
Tue, 3 Jan 2017 19:12:46 +0000 (21:12 +0200)
committerGitHub <noreply@github.com>
Tue, 3 Jan 2017 19:12:46 +0000 (21:12 +0200)
[sgen] Reenable gc-altstack test

1  2 
mono/tests/Makefile.am patch | diff1 | diff2 | blob | history

diff --combined mono/tests/Makefile.am
index b1e6d64d5b802b38455316f214912a78b05ec9b7,db85fcb1a3f0eb268c616c522f25ec3e4b718c2c..5b5fec5acd3c926310a0ff4ee5141d118975aa0a
--- 1/mono/tests/Makefile.am
--- 2/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@@ -1,6 -1,6 +1,6 @@@
  SUBDIRS = assemblyresolve gc-descriptors
  
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
  FEATUREFUL_RUNTIME_TEST =  
  else
  FEATUREFUL_RUNTIME_TEST = test-appdomain-unload
@@@ -41,21 -41,20 +41,21 @@@ CLASS=$(mcs_topdir)/class/lib/$(DEFAULT
  with_mono_path = MONO_PATH=$(CLASS)
  
  RUNTIME = $(with_mono_path) $(top_builddir)/runtime/mono-wrapper
 +TOOLS_RUNTIME = MONO_PATH=$(mcs_topdir)/class/lib/build $(top_builddir)/runtime/mono-wrapper --aot-path=$(mcs_topdir)/class/lib/build
  
  MKBUNDLE = \
        PKG_CONFIG_PATH=$(top_builddir):$(PKG_CONFIG_PATH) \
        $(RUNTIME) $(CLASS)/mkbundle.exe
  
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
  PROFILE_MCS_FLAGS = -d:MOBILE,MOBILE_LEGACY,FULL_AOT_DESKTOP 
  endif
  
 -if INSTALL_AOT_HYBRID
 +if INSTALL_TESTING_AOT_HYBRID
  PROFILE_MCS_FLAGS = -d:MOBILE,MOBILE_LEGACY 
  endif
  
 -MCS_NO_LIB = $(RUNTIME) $(CSC) -unsafe -debug:portable \
 +MCS_NO_LIB = $(TOOLS_RUNTIME) $(CSC) -unsafe -debug:portable \
        -noconfig -nologo \
        -nowarn:0162 -nowarn:0168 -nowarn:0219 -nowarn:0414 -nowarn:0618 \
        -nowarn:0169 -nowarn:1690 -nowarn:0649 -nowarn:0612 -nowarn:3021 \
@@@ -63,9 -62,9 +63,9 @@@
  
  MCS = $(MCS_NO_LIB) -lib:$(CLASS)
  
 -ILASM = $(RUNTIME) $(CLASS)/ilasm.exe
 +ILASM = $(TOOLS_RUNTIME) $(mcs_topdir)/class/lib/build/ilasm.exe
  
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
  TEST_RUNNER = ./test-runner.exe --runtime $(top_builddir)/runtime/mono-wrapper --mono-path "$(CLASS)" --aot-run-flags "$(AOT_RUN_FLAGS)" --aot-build-flags "$(AOT_BUILD_FLAGS)"
  else
  TEST_RUNNER = ./test-runner.exe --runtime $(top_builddir)/runtime/mono-wrapper --mono-path "$(CLASS)"
@@@ -714,7 -713,7 +714,7 @@@ endi
  
  PROFILE_DISABLED_TESTS=
  
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
  # Tests which rely on TypeLoadExceptions
  # In full-aot mode, these cause the relevant methods to be not AOTed.
  PROFILE_DISABLED_TESTS += \
@@@ -753,7 -752,7 +753,7 @@@ PROFILE_DISABLED_TESTS += 
        thunks.exe
  
  # Tests which load assemblies which are not
 -# in the aot_only profile
 +# in the testing_aot_full profile
  PROFILE_DISABLED_TESTS += \
        assembly-load-remap.exe
  
@@@ -841,7 -840,7 +841,7 @@@ PROFILE_DISABLED_TESTS += 
        bug-515884.exe
  endif
  
 -if INSTALL_AOT_HYBRID
 +if INSTALL_TESTING_AOT_HYBRID
  PROFILE_DISABLED_TESTS += \
        bug-80307.exe \
        namedmutex-destroy-race.exe
@@@ -856,7 -855,6 +856,6 @@@ CI_DISABLED_TESTS = 
        assemblyresolve_event3.exe \
        delegate2.exe   \
        finally_guard.exe \
-       gc-altstack.exe \
        generic-xdomain.2.exe
  
  # failing tests which we temporarily disable for PRs
@@@ -923,13 -921,13 +922,13 @@@ EXTRA_DIST=test-driver test-runner.cs $
  %.exe: %.il
        $(ILASM) -out:$@ $<
  
 -if !INSTALL_AOT_ONLY
 -if !INSTALL_AOT_HYBRID
 +if !INSTALL_TESTING_AOT_FULL
 +if !INSTALL_TESTING_AOT_HYBRID
  TEST_DRIVER_HARD_KILL_FEATURE=-r:Mono.Posix.dll
  endif
  endif
  
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
  TEST_DRIVER_DEPEND=TestDriver.dll$(PLATFORM_AOT_SUFFIX)
  else
  TEST_DRIVER_DEPEND=TestDriver.dll
@@@ -982,7 -980,7 +981,7 @@@ bug-81466-lib.dll$(PLATFORM_AOT_SUFFIX
  TestingReferenceAssembly.dll$(PLATFORM_AOT_SUFFIX)    \
  TestingReferenceReferenceAssembly.dll$(PLATFORM_AOT_SUFFIX)
  
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
  prereqs: $(PREREQSI_IL_AOT) $(PREREQSI_CS_AOT) $(AOT_EXTRA_LIBS)
  else
  prereqs: $(PREREQSI_IL) $(PREREQSI_CS)
@@@ -1027,7 -1025,7 +1026,7 @@@ test-sgen : sgen-test
  # Precompile the test assemblies in parallel
  compile-tests:
        $(MAKE) -j4 $(TESTSI_CS) $(TESTSI_IL) $(TESTBS) libtest.la $(PREREQSI_IL) $(PREREQSI_CS)
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
        $(MAKE) $(PREREQSI_IL_AOT) $(PREREQSI_CS_AOT) $(AOT_EXTRA_LIBS)
  endif
  
@@@ -1236,7 -1234,7 +1235,7 @@@ SGEN_REGULAR_TESTS_SRC =        
  
  SGEN_REGULAR_DISABLED_TESTS=
  
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
  SGEN_REGULAR_DISABLED_TESTS += \
        sgen-domain-unload.exe  \
        sgen-domain-unload-2.exe
@@@ -1446,7 -1444,7 +1445,7 @@@ imt_big_iface_test.exe: $(TEST_DRIVER_D
  EXTRA_DIST += test-inline-call-stack-library.cs test-inline-call-stack.cs
  test-inline-call-stack-library.dll: $(TEST_DRIVER_DEPEND) $(srcdir)/test-inline-call-stack-library.cs
        $(MCS) -t:library -out:test-inline-call-stack-library.dll $(srcdir)/test-inline-call-stack-library.cs
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
  endif
  
@@@ -1493,7 -1491,7 +1492,7 @@@ bug-81673.exe bug-81673-interface.dll: 
        $(MCS) -target:library -out:bug-81673-interface.dll $(srcdir)/bug-81673-interface.cs
        $(MCS) -out:bug-81673.exe -r:bug-81673-interface.dll $(srcdir)/bug-81673.cs
        $(MCS) -define:WITH_STOP -target:library -out:bug-81673-interface.dll $(srcdir)/bug-81673-interface.cs
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
  endif
  
@@@ -1502,7 -1500,7 +1501,7 @@@ bug-36848.exe bug-36848-a.dll: $(srcdir
        $(MCS) -target:library -out:bug-36848-a.dll $(srcdir)/bug-36848-a.cs
        $(MCS) -r:bug-36848-a.dll -out:bug-36848.exe $(srcdir)/bug-36848.cs
        $(MCS) -target:library -out:bug-36848-a.dll $(srcdir)/bug-36848-a.cs /define:WITH_STOP
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
  endif
  
@@@ -1517,7 -1515,7 +1516,7 @@@ bug-81691.exe: bug-81691-b.dl
  EXTRA_DIST += bug-81466-lib.il
  bug-81466-lib.dll: bug-81466-lib.il
        $(ILASM) /dll /output:bug-81466-lib.dll $(srcdir)/bug-81466-lib.il
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
  endif
  bug-81466.exe: bug-81466.il bug-81466-lib.dll
@@@ -1526,7 -1524,7 +1525,7 @@@
  EXTRA_DIST += bug-324535-il.il
  bug-324535-il.dll : bug-324535-il.il
        $(ILASM) /dll /output:bug-324535-il.dll $(srcdir)/bug-324535-il.il
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
  endif
  bug-324535.exe : bug-324535.cs bug-324535-il.dll
@@@ -1535,7 -1533,7 +1534,7 @@@
  EXTRA_DIST += custom-modifiers.2.cs custom-modifiers-lib.il
  custom-modifiers-lib.dll: custom-modifiers-lib.il
        $(ILASM) /dll /output:custom-modifiers-lib.dll $(srcdir)/custom-modifiers-lib.il
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
  endif
  custom-modifiers.2.exe: custom-modifiers.2.cs custom-modifiers-lib.dll
@@@ -1544,7 -1542,7 +1543,7 @@@
  EXTRA_DIST += bug-382986-lib.cs
  bug-382986-lib.dll: bug-382986-lib.cs
        $(MCS) -target:library -out:$@ $(srcdir)/bug-382986-lib.cs
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
  endif
  
@@@ -1571,14 -1569,14 +1570,14 @@@ test-coreclr-security : coreclr-securit
  EXTRA_DIST += generic-unboxing.2.il
  generic-unboxing.2.dll : generic-unboxing.2.il
        $(ILASM) /dll /output:generic-unboxing.2.dll $(srcdir)/generic-unboxing.2.il
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
  endif
  
  EXTRA_DIST += generic-boxing.2.il
  generic-boxing.2.dll : generic-boxing.2.il generic-unboxing.2.dll
        $(ILASM) /dll /output:generic-boxing.2.dll $(srcdir)/generic-boxing.2.il
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
  endif
  
@@@ -1593,7 -1591,7 +1592,7 @@@ generic-box.2.exe : generic-box.2.cs ge
  EXTRA_DIST += generic-delegate2.2.cs generic-delegate2-lib.2.il
  generic-delegate2-lib.2.dll : generic-delegate2-lib.2.il
        $(ILASM) /dll /output:$@ $(srcdir)/generic-delegate2-lib.2.il
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
        $(RUNTIME) $(AOT_BUILD_FLAGS) $@
  endif
  generic-delegate2.2.exe : generic-delegate2.2.cs generic-delegate2-lib.2.dll
@@@ -1664,7 -1662,7 +1663,7 @@@ GSHARED_TESTS_SRC = 
  
  GSHARED_DISABLED_TESTS=
  
 -if INSTALL_AOT_ONLY
 +if INSTALL_TESTING_AOT_FULL
  GSHARED_DISABLED_TESTS += \
        generic-type-builder.2.exe
  endif
my mono mirror. check out Moved to http://github.com/mono/mono