[Pkg-mono-svn-commits] [SCM] mono branch, master-experimental, updated. debian/2.6.3-4-34-gd1bf954

[Mirco Bauer]

The following commit has been merged in the master-experimental branch:
commit 39684ac94bd90d574598b12b3de3e0fbf3550a0b
Merge: cb99744bbc563c721472640dc9f6aa16a0646db5 4b748d4b078b6dee8ff440285ef225bacf2e9fe4
Author: Mirco Bauer <meebey at meebey.net>
Date:   Tue Aug 3 01:08:24 2010 +0200

    Merge branch 'debian/patches/disable_bug-80307_test' into merge/2.6.7

diff --combined mono/tests/Makefile.am
index bd8b76d,1126513..0570cc0
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@@ -306,7 -306,6 +306,7 @@@ BASE_TEST_CS_SRC=		
  	bug-473482.2.cs	\
  	bug-473999.2.cs	\
  	bug-479763.2.cs	\
 +	bug-616463.cs	\
  	bug-80392.2.cs		\
  	dynamic-method-access.2.cs	\
  	dynamic-method-finalize.2.cs	\
@@@ -337,7 -336,6 +337,6 @@@
  	modules.cs	\
  	bug-81673.cs	\
  	bug-81691.cs	\
- 	bug-80307.cs	\
  	bug-415577.cs	\
  	filter-stack.cs	\
  	vararg2.cs	\
@@@ -362,8 -360,7 +361,8 @@@
  	appdomain-thread-abort.cs \
  	w32message.cs	\
  	bug-544446.cs	\
 -	gc-altstack.cs
 +	gc-altstack.cs	\
 +	bug-599469.cs
  
  if AMD64
  TEST_CS_SRC = $(BASE_TEST_CS_SRC) async-exc-compilation.cs
@@@ -796,7 -793,7 +795,7 @@@ test-generic-sharing : generics-sharing
  		generic-stack-traces.2.exe generic-stack-traces2.2.exe		\
  		bug-472600.2.exe bug-473482.2.exe bug-473999.2.exe		\
  		bug-479763.2.exe generic-xdomain.2.exe				\
 -		generic-type-load-exception.2.exe
 +		generic-type-load-exception.2.exe bug-616463.exe
  	@for fn in $+ ; do	\
  		echo "Testing $$fn ...";	\
  		MONO_GENERIC_SHARING=all $(RUNTIME) -O=gshared                $$fn > $$fn.stdout || exit 1;	\

-- 
mono