[Numpy-svn] r6411 - in branches/coremath/numpy: distutils/command lib/tests
numpy-svn at scipy.org
numpy-svn at scipy.org
Thu Feb 19 05:25:23 EST 2009
Author: cdavid
Date: 2009-02-19 04:24:58 -0600 (Thu, 19 Feb 2009)
New Revision: 6411
Modified:
branches/coremath/numpy/distutils/command/config.py
branches/coremath/numpy/lib/tests/test_io.py
branches/coremath/numpy/lib/tests/test_recfunctions.py
Log:
Merge r6410.
Modified: branches/coremath/numpy/distutils/command/config.py
===================================================================
--- branches/coremath/numpy/distutils/command/config.py 2009-02-19 10:05:28 UTC (rev 6410)
+++ branches/coremath/numpy/distutils/command/config.py 2009-02-19 10:24:58 UTC (rev 6411)
@@ -212,7 +212,7 @@
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)
Modified: branches/coremath/numpy/lib/tests/test_io.py
===================================================================
--- branches/coremath/numpy/lib/tests/test_io.py 2009-02-19 10:05:28 UTC (rev 6410)
+++ branches/coremath/numpy/lib/tests/test_io.py 2009-02-19 10:24:58 UTC (rev 6411)
@@ -76,6 +76,7 @@
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 @@
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()
Modified: branches/coremath/numpy/lib/tests/test_recfunctions.py
===================================================================
--- branches/coremath/numpy/lib/tests/test_recfunctions.py 2009-02-19 10:05:28 UTC (rev 6410)
+++ branches/coremath/numpy/lib/tests/test_recfunctions.py 2009-02-19 10:24:58 UTC (rev 6411)
@@ -1,3 +1,4 @@
+import sys
import numpy as np
import numpy.ma as ma
@@ -137,6 +138,7 @@
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 @@
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)]
More information about the Numpy-svn
mailing list