diff options
| author | David Cournapeau <cournape@gmail.com> | 2009-02-19 10:24:58 +0000 |
|---|---|---|
| committer | David Cournapeau <cournape@gmail.com> | 2009-02-19 10:24:58 +0000 |
| commit | e0c77133a9165afa6370e4203d01028b5b96eb4b (patch) | |
| tree | 148691821636a6eb90e29adccd0ac807a3184b64 | |
| parent | 242d42bc8eafa8fdec2c551d365c5e83ec5692d3 (diff) | |
| parent | 000030d48295a8c44001cfd7350dd959d7e3338d (diff) | |
| download | numpy-e0c77133a9165afa6370e4203d01028b5b96eb4b.tar.gz | |
Merge r6410.
| -rw-r--r-- | numpy/distutils/command/config.py | 2 | ||||
| -rw-r--r-- | numpy/lib/tests/test_io.py | 2 | ||||
| -rw-r--r-- | numpy/lib/tests/test_recfunctions.py | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/numpy/distutils/command/config.py b/numpy/distutils/command/config.py index 0290078e6..76ba1c740 100644 --- a/numpy/distutils/command/config.py +++ b/numpy/distutils/command/config.py @@ -212,7 +212,7 @@ main (void) 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 index 935773134..da91101aa 100644 --- a/numpy/lib/tests/test_io.py +++ b/numpy/lib/tests/test_io.py @@ -76,6 +76,7 @@ class RoundtripTest(object): 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 TestSavezLoad(RoundtripTest, TestCase): 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 index f7a72071c..424d60ae4 100644 --- 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 @@ class TestRecFunctions(TestCase): 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 @@ class TestRecFunctions(TestCase): 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)] |