Tag more mingw-w64 failures as such.

2 files changed, 24 insertions, 0 deletions

diff --git a/numpy/core/tests/test_scalarmath.py b/numpy/core/tests/test_scalarmath.py
index 6001f6b72..3b92823d1 100644
--- a/numpy/core/tests/test_scalarmath.py
+++ b/numpy/core/tests/test_scalarmath.py
@@ -1,3 +1,4 @@
+import sys
 from numpy.testing import *
 import numpy as np
 
@@ -6,6 +7,10 @@ types = [np.bool_, np.byte, np.ubyte, np.short, np.ushort, np.intc, np.uintc,
          np.single, np.double, np.longdouble, np.csingle,
          np.cdouble, np.clongdouble]
 
+def iswin64():
+    import platform
+    return platform.architecture()[0] == "64bit" and sys.platform == "win32"
+
 # This compares scalarmath against ufuncs.
 
 class TestTypes(TestCase):
@@ -42,6 +47,7 @@ class TestPower(TestCase):
             b = a ** 4
             assert b == 81, "error with %r: got %r" % (t,b)
 
+    @dec.knownfailureif(iswin64(), "Crash on win64")
     def test_large_types(self):
         for t in [np.int32, np.int64, np.float32, np.float64, np.longdouble]:
             a = t(51)
diff --git a/numpy/core/tests/test_unicode.py b/numpy/core/tests/test_unicode.py
index 3588e3d35..50aa5f3e1 100644
--- a/numpy/core/tests/test_unicode.py
+++ b/numpy/core/tests/test_unicode.py
@@ -1,6 +1,12 @@
+import sys
+
 from numpy.testing import *
 from numpy.core import *
 
+def iswin64():
+    import platform
+    return platform.architecture()[0] == "64bit" and sys.platform == "win32"
+
 # Guess the UCS length for this python interpreter
 if len(buffer(u'u')) == 4:
     ucs4 = True
@@ -36,17 +42,20 @@ class create_zeros(object):
         else:
             self.assert_(len(buffer(ua_scalar)) == 0)
 
+    @dec.knownfailureif(iswin64(), "Crash on win64")
     def test_zeros0D(self):
         """Check creation of 0-dimensional objects"""
         ua = zeros((), dtype='U%s' % self.ulen)
         self.content_check(ua, ua[()], 4*self.ulen)
 
+    @dec.knownfailureif(iswin64(), "Crash on win64")
     def test_zerosSD(self):
         """Check creation of single-dimensional objects"""
         ua = zeros((2,), dtype='U%s' % self.ulen)
         self.content_check(ua, ua[0], 4*self.ulen*2)
         self.content_check(ua, ua[1], 4*self.ulen*2)
 
+    @dec.knownfailureif(iswin64(), "Crash on win64")
     def test_zerosMD(self):
         """Check creation of multi-dimensional objects"""
         ua = zeros((2,3,4), dtype='U%s' % self.ulen)
@@ -96,17 +105,20 @@ class create_values(object):
                 # regular 2-byte word
                 self.assert_(len(buffer(ua_scalar)) == 2*self.ulen)
 
+    @dec.knownfailureif(iswin64(), "Crash on win64")
     def test_values0D(self):
         """Check creation of 0-dimensional objects with values"""
         ua = array(self.ucs_value*self.ulen, dtype='U%s' % self.ulen)
         self.content_check(ua, ua[()], 4*self.ulen)
 
+    @dec.knownfailureif(iswin64(), "Crash on win64")
     def test_valuesSD(self):
         """Check creation of single-dimensional objects with values"""
         ua = array([self.ucs_value*self.ulen]*2, dtype='U%s' % self.ulen)
         self.content_check(ua, ua[0], 4*self.ulen*2)
         self.content_check(ua, ua[1], 4*self.ulen*2)
 
+    @dec.knownfailureif(iswin64(), "Crash on win64")
     def test_valuesMD(self):
         """Check creation of multi-dimensional objects with values"""
         ua = array([[[self.ucs_value*self.ulen]*2]*3]*4, dtype='U%s' % self.ulen)
@@ -181,12 +193,14 @@ class assign_values(object):
                 # regular 2-byte word
                 self.assert_(len(buffer(ua_scalar)) == 2*self.ulen)
 
+    @dec.knownfailureif(iswin64(), "Crash on win64")
     def test_values0D(self):
         """Check assignment of 0-dimensional objects with values"""
         ua = zeros((), dtype='U%s' % self.ulen)
         ua[()] = self.ucs_value*self.ulen
         self.content_check(ua, ua[()], 4*self.ulen)
 
+    @dec.knownfailureif(iswin64(), "Crash on win64")
     def test_valuesSD(self):
         """Check assignment of single-dimensional objects with values"""
         ua = zeros((2,), dtype='U%s' % self.ulen)
@@ -195,6 +209,7 @@ class assign_values(object):
         ua[1] = self.ucs_value*self.ulen
         self.content_check(ua, ua[1], 4*self.ulen*2)
 
+    @dec.knownfailureif(iswin64(), "Crash on win64")
     def test_valuesMD(self):
         """Check assignment of multi-dimensional objects with values"""
         ua = zeros((2,3,4), dtype='U%s' % self.ulen)
@@ -248,6 +263,7 @@ class test_assign_values_1009_ucs4(assign_values, TestCase):
 class byteorder_values:
     """Check the byteorder of unicode arrays in round-trip conversions"""
 
+    @dec.knownfailureif(iswin64(), "Crash on win64")
     def test_values0D(self):
         """Check byteorder of 0-dimensional objects"""
         ua = array(self.ucs_value*self.ulen, dtype='U%s' % self.ulen)
@@ -260,6 +276,7 @@ class byteorder_values:
         # Arrays must be equal after the round-trip
         assert_equal(ua, ua3)
 
+    @dec.knownfailureif(iswin64(), "Crash on win64")
     def test_valuesSD(self):
         """Check byteorder of single-dimensional objects"""
         ua = array([self.ucs_value*self.ulen]*2, dtype='U%s' % self.ulen)
@@ -270,6 +287,7 @@ class byteorder_values:
         # Arrays must be equal after the round-trip
         assert_equal(ua, ua3)
 
+    @dec.knownfailureif(iswin64(), "Crash on win64")
     def test_valuesMD(self):
         """Check byteorder of multi-dimensional objects"""
         ua = array([[[self.ucs_value*self.ulen]*2]*3]*4,