Merge r6410.

cournape · cournape · commit e0c77133a916 · 2009-02-19T10:24:58.000Z
diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py
@@ -212,7 +212,7 @@ def check_type_size(self, type_name, headers=None, include_dirs=None):
         try:
             src, obj, exe = self._link(body, headers, include_dirs,
                                        [], [], 'c')
-            exe = os.path.join('.', exe)
+            #exe = os.path.join('.', exe)
             exitstatus, output = exec_command(exe, execute_in='.')
             if hasattr(os, 'WEXITSTATUS'):
                 exitcode = os.WEXITSTATUS(exitstatus)
diff --git a/numpy/lib/tests/test_io.py b/numpy/lib/tests/test_io.py
@@ -76,6 +76,7 @@ def test_1D(self):
         a = np.array([1, 2, 3, 4], int)
         self.roundtrip(a)
 
+    @np.testing.dec.knownfailureif(sys.platform=='win32', "Fail on Win32")
     def test_mmap(self):
         a = np.array([[1, 2.5], [4, 7.3]])
         self.roundtrip(a, file_on_disk=True, load_kwds={'mmap_mode': 'r'})
@@ -112,6 +113,7 @@ def test_named_arrays(self):
 
 
 class TestSaveTxt(TestCase):
+    @np.testing.dec.knownfailureif(sys.platform=='win32', "Fail on Win32")
     def test_array(self):
         a =np.array([[1, 2], [3, 4]], float)
         c = StringIO.StringIO()
diff --git a/numpy/lib/tests/test_recfunctions.py b/numpy/lib/tests/test_recfunctions.py
@@ -1,3 +1,4 @@
+import sys
 
 import numpy as np
 import numpy.ma as ma
@@ -137,6 +138,7 @@ def test_get_fieldstructure(self):
         assert_equal(test, control)
 
 
+    @np.testing.dec.knownfailureif(sys.platform=='win32', "Fail on Win32")
     def test_find_duplicates(self):
         "Test find_duplicates"
         a = ma.array([(2, (2., 'B')), (1, (2., 'B')), (2, (2., 'B')),
@@ -171,6 +173,7 @@ def test_find_duplicates(self):
         assert_equal(test[0], a[control])
 
 
+    @np.testing.dec.knownfailureif(sys.platform=='win32', "Fail on Win32")
     def test_find_duplicates_ignoremask(self):
         "Test the ignoremask option of find_duplicates"
         ndtype = [('a', int)]
