From 575ffec62e9b24513db48cd5af3a1100fc79143f Mon Sep 17 00:00:00 2001 From: Nirbheek Chauhan Date: Thu, 3 May 2018 18:56:34 +0530 Subject: python module: Move tests to test cases/unit The tests are only run via unit tests, so that's where they should be. --- test cases/python/1 extmodule/blaster.py | 14 ----- test cases/python/1 extmodule/ext/meson.build | 6 --- test cases/python/1 extmodule/ext/tachyon_module.c | 59 ---------------------- test cases/python/1 extmodule/meson.build | 23 --------- test cases/python/1 extmodule/meson_options.txt | 3 -- 5 files changed, 105 deletions(-) delete mode 100755 test cases/python/1 extmodule/blaster.py delete mode 100644 test cases/python/1 extmodule/ext/meson.build delete mode 100644 test cases/python/1 extmodule/ext/tachyon_module.c delete mode 100644 test cases/python/1 extmodule/meson.build delete mode 100644 test cases/python/1 extmodule/meson_options.txt (limited to 'test cases/python') diff --git a/test cases/python/1 extmodule/blaster.py b/test cases/python/1 extmodule/blaster.py deleted file mode 100755 index 163b6d426..000000000 --- a/test cases/python/1 extmodule/blaster.py +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env python - -import sys -import tachyon - -result = tachyon.phaserize('shoot') - -if not isinstance(result, int): - print('Returned result not an integer.') - sys.exit(1) - -if result != 1: - print('Returned result {} is not 1.'.format(result)) - sys.exit(1) diff --git a/test cases/python/1 extmodule/ext/meson.build b/test cases/python/1 extmodule/ext/meson.build deleted file mode 100644 index b13bb326f..000000000 --- a/test cases/python/1 extmodule/ext/meson.build +++ /dev/null @@ -1,6 +0,0 @@ -pylib = py.extension_module('tachyon', - 'tachyon_module.c', - dependencies : py_dep, -) - -pypathdir = meson.current_build_dir() diff --git a/test cases/python/1 extmodule/ext/tachyon_module.c b/test cases/python/1 extmodule/ext/tachyon_module.c deleted file mode 100644 index 68eda5380..000000000 --- a/test cases/python/1 extmodule/ext/tachyon_module.c +++ /dev/null @@ -1,59 +0,0 @@ -/* - Copyright 2018 The Meson development team - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. -*/ - -/* A very simple Python extension module. */ - -#include -#include - -static PyObject* phaserize(PyObject *self, PyObject *args) { - const char *message; - int result; - - if(!PyArg_ParseTuple(args, "s", &message)) - return NULL; - - result = strcmp(message, "shoot") ? 0 : 1; -#if PY_VERSION_HEX < 0x03000000 - return PyInt_FromLong(result); -#else - return PyLong_FromLong(result); -#endif -} - -static PyMethodDef TachyonMethods[] = { - {"phaserize", phaserize, METH_VARARGS, - "Shoot tachyon cannons."}, - {NULL, NULL, 0, NULL} -}; - -#if PY_VERSION_HEX < 0x03000000 -PyMODINIT_FUNC inittachyon(void) { - Py_InitModule("tachyon", TachyonMethods); -} -#else -static struct PyModuleDef tachyonmodule = { - PyModuleDef_HEAD_INIT, - "tachyon", - NULL, - -1, - TachyonMethods -}; - -PyMODINIT_FUNC PyInit_tachyon(void) { - return PyModule_Create(&tachyonmodule); -} -#endif diff --git a/test cases/python/1 extmodule/meson.build b/test cases/python/1 extmodule/meson.build deleted file mode 100644 index 479865482..000000000 --- a/test cases/python/1 extmodule/meson.build +++ /dev/null @@ -1,23 +0,0 @@ -project('Python extension module', 'c', - default_options : ['buildtype=release']) - -py_mod = import('python') - -py = py_mod.find_installation(get_option('python'), required : false) - -if py.found() - py_dep = py.dependency() - - if py_dep.found() - subdir('ext') - - test('extmod', - py, - args : files('blaster.py'), - env : ['PYTHONPATH=' + pypathdir]) - else - error('MESON_SKIP_TEST: Python libraries not found, skipping test.') - endif -else - error('MESON_SKIP_TEST: Python not found, skipping test.') -endif diff --git a/test cases/python/1 extmodule/meson_options.txt b/test cases/python/1 extmodule/meson_options.txt deleted file mode 100644 index b8f645d09..000000000 --- a/test cases/python/1 extmodule/meson_options.txt +++ /dev/null @@ -1,3 +0,0 @@ -option('python', type: 'string', - description: 'Name of or path to the python executable' -) -- cgit v1.2.3