Move memoryview and buffer tests

cython · Jun 19, 2012 · ea8e64b · ea8e64b
1 parent b337929
commit ea8e64b
Show file tree

Hide file tree

Showing 17 changed files with 8 additions and 3 deletions.
diff --git a/tests/run/bufaccess.h → tests/buffers/bufaccess.h b/tests/run/bufaccess.h → tests/buffers/bufaccess.h
diff --git a/tests/run/bufaccess.pyx → tests/buffers/bufaccess.pyx b/tests/run/bufaccess.pyx → tests/buffers/bufaccess.pyx
diff --git a/tests/run/buffer.pyx → tests/buffers/buffer.pyx b/tests/run/buffer.pyx → tests/buffers/buffer.pyx
diff --git a/tests/run/buffmt.pyx → tests/buffers/buffmt.pyx b/tests/run/buffmt.pyx → tests/buffers/buffmt.pyx
diff --git a/tests/run/mockbuffers.pxi → tests/buffers/mockbuffers.pxi b/tests/run/mockbuffers.pxi → tests/buffers/mockbuffers.pxi
diff --git a/tests/memoryview/bufaccess.h b/tests/memoryview/bufaccess.h
@@ -0,0 +1,5 @@
+/* See bufaccess.pyx */
+
+typedef short td_h_short;
+typedef double td_h_double;
+typedef unsigned short td_h_ushort;
diff --git a/tests/compile/memview_declaration.pyx → tests/memoryview/compile_declarations.pyx b/tests/compile/memview_declaration.pyx → tests/memoryview/compile_declarations.pyx
diff --git a/tests/run/cythonarray.pyx → tests/memoryview/cythonarray.pyx b/tests/run/cythonarray.pyx → tests/memoryview/cythonarray.pyx
diff --git a/tests/run/cythonarrayutil.pxi → tests/memoryview/cythonarrayutil.pxi b/tests/run/cythonarrayutil.pxi → tests/memoryview/cythonarrayutil.pxi
diff --git a/tests/errors/memview_declarations.pyx → tests/memoryview/error_declarations.pyx b/tests/errors/memview_declarations.pyx → tests/memoryview/error_declarations.pyx
diff --git a/tests/run/memoryview.pxd → tests/memoryview/memoryview.pxd b/tests/run/memoryview.pxd → tests/memoryview/memoryview.pxd
diff --git a/tests/run/memoryview.pyx → tests/memoryview/memoryview.pyx b/tests/run/memoryview.pyx → tests/memoryview/memoryview.pyx
@@ -17,7 +17,7 @@ cimport cython
 cdef extern from "Python.h":
     cdef int PyBUF_C_CONTIGUOUS
 
-include "mockbuffers.pxi"
+include "../buffers/mockbuffers.pxi"
 
 #
 ### Test for some coercions

diff --git a/tests/run/memoryview_acq_count.srctree → ...s/memoryview/memoryview_acq_count.srctree b/tests/run/memoryview_acq_count.srctree → ...s/memoryview/memoryview_acq_count.srctree
diff --git a/.../memoryview_compare_type_pointers.srctree → .../memoryview_compare_type_pointers.srctree b/.../memoryview_compare_type_pointers.srctree → .../memoryview_compare_type_pointers.srctree
diff --git a/tests/run/memoryviewattrs.pyx → tests/memoryview/memoryviewattrs.pyx b/tests/run/memoryviewattrs.pyx → tests/memoryview/memoryviewattrs.pyx
diff --git a/tests/run/memslice.pyx → tests/memoryview/memslice.pyx b/tests/run/memslice.pyx → tests/memoryview/memslice.pyx
@@ -46,7 +46,7 @@ def testcase(func):
     return wrapper
 
 
-include "mockbuffers.pxi"
+include "../buffers/mockbuffers.pxi"
 include "cythonarrayutil.pxi"
 
 def _print_attributes(memview):

diff --git a/tests/run/numpy_memoryview.pyx → tests/memoryview/numpy_memoryview.pyx b/tests/run/numpy_memoryview.pyx → tests/memoryview/numpy_memoryview.pyx
@@ -12,7 +12,7 @@ import numpy as np
 cimport cython
 
 include "cythonarrayutil.pxi"
-include "mockbuffers.pxi"
+include "../buffers/mockbuffers.pxi"
 
 ctypedef np.int32_t dtype_t