From ea8e64b9dc6238f18d8f5091ae6d962ed9bf81b8 Mon Sep 17 00:00:00 2001 From: Mark Florisson Date: Tue, 19 Jun 2012 17:13:27 +0100 Subject: [PATCH] Move memoryview and buffer tests --- tests/{run => buffers}/bufaccess.h | 0 tests/{run => buffers}/bufaccess.pyx | 0 tests/{run => buffers}/buffer.pyx | 0 tests/{run => buffers}/buffmt.pyx | 0 tests/{run => buffers}/mockbuffers.pxi | 0 tests/memoryview/bufaccess.h | 5 +++++ .../memview_declaration.pyx => memoryview/compile_declarations.pyx} | 0 tests/{run => memoryview}/cythonarray.pyx | 0 tests/{run => memoryview}/cythonarrayutil.pxi | 0 .../memview_declarations.pyx => memoryview/error_declarations.pyx} | 0 tests/{run => memoryview}/memoryview.pxd | 0 tests/{run => memoryview}/memoryview.pyx | 2 +- tests/{run => memoryview}/memoryview_acq_count.srctree | 0 tests/{run => memoryview}/memoryview_compare_type_pointers.srctree | 0 tests/{run => memoryview}/memoryviewattrs.pyx | 0 tests/{run => memoryview}/memslice.pyx | 2 +- tests/{run => memoryview}/numpy_memoryview.pyx | 2 +- 17 files changed, 8 insertions(+), 3 deletions(-) rename tests/{run => buffers}/bufaccess.h (100%) rename tests/{run => buffers}/bufaccess.pyx (100%) rename tests/{run => buffers}/buffer.pyx (100%) rename tests/{run => buffers}/buffmt.pyx (100%) rename tests/{run => buffers}/mockbuffers.pxi (100%) create mode 100644 tests/memoryview/bufaccess.h rename tests/{compile/memview_declaration.pyx => memoryview/compile_declarations.pyx} (100%) rename tests/{run => memoryview}/cythonarray.pyx (100%) rename tests/{run => memoryview}/cythonarrayutil.pxi (100%) rename tests/{errors/memview_declarations.pyx => memoryview/error_declarations.pyx} (100%) rename tests/{run => memoryview}/memoryview.pxd (100%) rename tests/{run => memoryview}/memoryview.pyx (99%) rename tests/{run => memoryview}/memoryview_acq_count.srctree (100%) rename tests/{run => memoryview}/memoryview_compare_type_pointers.srctree (100%) rename tests/{run => memoryview}/memoryviewattrs.pyx (100%) rename tests/{run => memoryview}/memslice.pyx (99%) rename tests/{run => memoryview}/numpy_memoryview.pyx (99%) diff --git a/tests/run/bufaccess.h b/tests/buffers/bufaccess.h similarity index 100% rename from tests/run/bufaccess.h rename to tests/buffers/bufaccess.h diff --git a/tests/run/bufaccess.pyx b/tests/buffers/bufaccess.pyx similarity index 100% rename from tests/run/bufaccess.pyx rename to tests/buffers/bufaccess.pyx diff --git a/tests/run/buffer.pyx b/tests/buffers/buffer.pyx similarity index 100% rename from tests/run/buffer.pyx rename to tests/buffers/buffer.pyx diff --git a/tests/run/buffmt.pyx b/tests/buffers/buffmt.pyx similarity index 100% rename from tests/run/buffmt.pyx rename to tests/buffers/buffmt.pyx diff --git a/tests/run/mockbuffers.pxi b/tests/buffers/mockbuffers.pxi similarity index 100% rename from tests/run/mockbuffers.pxi rename to tests/buffers/mockbuffers.pxi diff --git a/tests/memoryview/bufaccess.h b/tests/memoryview/bufaccess.h new file mode 100644 index 0000000..48715bb --- /dev/null +++ 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 b/tests/memoryview/compile_declarations.pyx similarity index 100% rename from tests/compile/memview_declaration.pyx rename to tests/memoryview/compile_declarations.pyx diff --git a/tests/run/cythonarray.pyx b/tests/memoryview/cythonarray.pyx similarity index 100% rename from tests/run/cythonarray.pyx rename to tests/memoryview/cythonarray.pyx diff --git a/tests/run/cythonarrayutil.pxi b/tests/memoryview/cythonarrayutil.pxi similarity index 100% rename from tests/run/cythonarrayutil.pxi rename to tests/memoryview/cythonarrayutil.pxi diff --git a/tests/errors/memview_declarations.pyx b/tests/memoryview/error_declarations.pyx similarity index 100% rename from tests/errors/memview_declarations.pyx rename to tests/memoryview/error_declarations.pyx diff --git a/tests/run/memoryview.pxd b/tests/memoryview/memoryview.pxd similarity index 100% rename from tests/run/memoryview.pxd rename to tests/memoryview/memoryview.pxd diff --git a/tests/run/memoryview.pyx b/tests/memoryview/memoryview.pyx similarity index 99% rename from tests/run/memoryview.pyx rename to tests/memoryview/memoryview.pyx index 38b8131..db560cd 100644 --- a/tests/run/memoryview.pyx +++ b/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 b/tests/memoryview/memoryview_acq_count.srctree similarity index 100% rename from tests/run/memoryview_acq_count.srctree rename to tests/memoryview/memoryview_acq_count.srctree diff --git a/tests/run/memoryview_compare_type_pointers.srctree b/tests/memoryview/memoryview_compare_type_pointers.srctree similarity index 100% rename from tests/run/memoryview_compare_type_pointers.srctree rename to tests/memoryview/memoryview_compare_type_pointers.srctree diff --git a/tests/run/memoryviewattrs.pyx b/tests/memoryview/memoryviewattrs.pyx similarity index 100% rename from tests/run/memoryviewattrs.pyx rename to tests/memoryview/memoryviewattrs.pyx diff --git a/tests/run/memslice.pyx b/tests/memoryview/memslice.pyx similarity index 99% rename from tests/run/memslice.pyx rename to tests/memoryview/memslice.pyx index 432a9e0..a32e639 100644 --- a/tests/run/memslice.pyx +++ b/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 b/tests/memoryview/numpy_memoryview.pyx similarity index 99% rename from tests/run/numpy_memoryview.pyx rename to tests/memoryview/numpy_memoryview.pyx index b45584c..78bc08f 100644 --- a/tests/run/numpy_memoryview.pyx +++ b/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 -- 2.7.4