Change text of exception, replace test spam module for more generic

pypa · Nov 3, 2019 · 9d65112 · 9d65112
1 parent 17b6298
commit 9d65112
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/cibuildwheel/linux.py b/cibuildwheel/linux.py
@@ -42,7 +42,7 @@ def build(project_dir, output_dir, test_command, test_requires, test_extras, bef
 
     python_configurations = get_python_configurations(build_selector)
     if len(python_configurations) == 0:
-        raise ValueError("Empty list of configuration to build. Check 'CIBW_BUILD' and 'CIBW_SKIP' environment variables. " \
+        raise ValueError("No linux build identifiers are selected after applying 'CIBW_BUILD' and 'CIBW_SKIP'. " \
             "Check documentation if python version identifier do not change")
     platforms = [
         ('manylinux_x86_64', manylinux_images['x86_64']),

diff --git a/cibuildwheel/macos.py b/cibuildwheel/macos.py
@@ -28,7 +28,7 @@ def get_python_configurations(build_selector):
 def build(project_dir, output_dir, test_command, test_requires, test_extras, before_build, build_verbosity, build_selector, environment):
     python_configurations = get_python_configurations(build_selector)
     if len(python_configurations) == 0:
-        raise ValueError("Empty list of configuration to build. Check 'CIBW_BUILD' and 'CIBW_SKIP' environment variables " \
+        raise ValueError("No macosx build identifiers are selected after applying 'CIBW_BUILD' and 'CIBW_SKIP'. " \
                         "Check documentation if python version identifier do not change")
     get_pip_url = 'https://bootstrap.pypa.io/get-pip.py'
     get_pip_script = '/tmp/get-pip.py'

diff --git a/cibuildwheel/windows.py b/cibuildwheel/windows.py
@@ -116,7 +116,7 @@ def shell(args, env=None, cwd=None):
 
     python_configurations = get_python_configurations(build_selector)
     if len(python_configurations) == 0:
-        raise ValueError("Empty list of configuration to build. Check 'CIBW_BUILD' and 'CIBW_SKIP' environment variables " \
+        raise ValueError("No windows build identifiers are selected after applying 'CIBW_BUILD' and 'CIBW_SKIP'. " \
                         "Check documentation if python version identifier do not change")
     for config in python_configurations:
         config_python_path = get_python_path(config)

diff --git a/test/09_platform_selector_problem/spam.c b/test/09_platform_selector_problem/spam.c
@@ -1,23 +1,14 @@
 #include <Python.h>
-#if defined(__linux__)
-#include <malloc.h>
-#endif
 
 static PyObject *
 spam_system(PyObject *self, PyObject *args)
 {
     const char *command;
-    int sts = 0;
+    int sts;
 
     if (!PyArg_ParseTuple(args, "s", &command))
         return NULL;
-
-#if defined(__linux__)
-    sts = malloc_info(0, stdout);
-#endif
-    if (sts == 0) {
-        sts = system(command);
-    }
+    sts = system(command);
     return PyLong_FromLong(sts);
 }