Commit bbeea61a authored by Marius Wachtler's avatar Marius Wachtler

add a pyopenssl test + don't define PYPY_VERSION

parent 0c693471
...@@ -50,6 +50,7 @@ addons: ...@@ -50,6 +50,7 @@ addons:
- libcurl4-openssl-dev - libcurl4-openssl-dev
- libxml2-dev - libxml2-dev
- libxslt1-dev - libxslt1-dev
- libssl-dev
before_install: before_install:
- if [ "$CC" = "clang" ]; then export CC="clang-3.5" CXX="clang++-3.5"; fi - if [ "$CC" = "clang" ]; then export CC="clang-3.5" CXX="clang++-3.5"; fi
......
...@@ -18,8 +18,7 @@ ...@@ -18,8 +18,7 @@
// Cython depends on having this define set: // Cython depends on having this define set:
#define Py_PYTHON_H #define Py_PYTHON_H
// Cython has some "not targeting CPython" support that is triggered by having PYPY_VERSION defined: #define PYSTON_VERSION "0.3"
#define PYPY_VERSION "Pyston"
// These include orders come from CPython: // These include orders come from CPython:
#include "patchlevel.h" #include "patchlevel.h"
......
import os, sys
sys.path.append(os.path.dirname(__file__) + "/../lib")
from test_helper import create_virtenv, run_test
ENV_NAME = os.path.abspath("pyopenssl_test_env_" + os.path.basename(sys.executable))
NOSETESTS_EXE = os.path.abspath(os.path.join(ENV_NAME, "bin", "nosetests"))
PYOPENSSL_DIR = os.path.abspath(os.path.join(ENV_NAME, "site-packages", "OpenSSL"))
packages = ["nose==1.3.7", "pycparser==2.13", "cryptography==1.0.1", "pyopenssl==0.15.1", "pyasn1==0.1.7", "idna==2.0", "six==1.9.0", "enum34==1.0.4", "ipaddress==1.0.14", "cffi==1.1.0"]
create_virtenv(ENV_NAME, packages, force_create = True)
expected = [{'ran': 247, 'errors': 2, 'failures': 0}]
run_test([NOSETESTS_EXE], cwd=PYOPENSSL_DIR, expected=expected)
From 27b69179b90851da187d698a0817b0b8190a0449 Mon Sep 17 00:00:00 2001 From e0257ba4efd903da2a0f1909d21d51ff1799a3c6 Mon Sep 17 00:00:00 2001
From: Marius Wachtler <undingen@gmail.com> From: Marius Wachtler <undingen@gmail.com>
Date: Tue, 9 Jun 2015 19:26:44 +0200 Date: Tue, 9 Jun 2015 19:26:44 +0200
Subject: [PATCH] Pyston change: we don't support custom traceback entries yet Subject: [PATCH] Pyston change: we don't support custom traceback entries yet
--- ---
Cython/Compiler/ExprNodes.py | 9 +++++++++ Cython/Compiler/ExprNodes.py | 9 +++++++++
Cython/Compiler/ModuleNode.py | 8 ++++++-- Cython/Compiler/ModuleNode.py | 8 ++++++--
Cython/Utility/CythonFunction.c | 4 +++- Cython/Utility/CythonFunction.c | 4 +++-
Cython/Utility/Exceptions.c | 7 ++++++- Cython/Utility/Exceptions.c | 7 ++++++-
Cython/Utility/Generator.c | 41 +++++++++++++++++++++++++++++------------ Cython/Utility/Generator.c | 41 ++++++++++++++++++++++++++++------------
5 files changed, 53 insertions(+), 16 deletions(-) Cython/Utility/ModuleSetupCode.c | 2 +-
6 files changed, 54 insertions(+), 17 deletions(-)
diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py diff --git a/Cython/Compiler/ExprNodes.py b/Cython/Compiler/ExprNodes.py
index f99ec6e..7ab41f3 100644 index f99ec6e..7ab41f3 100644
...@@ -188,6 +189,19 @@ index 0310570..70e550c 100644 ...@@ -188,6 +189,19 @@ index 0310570..70e550c 100644
#endif #endif
0, /*tp_version_tag*/ 0, /*tp_version_tag*/
#if PY_VERSION_HEX >= 0x030400a1 #if PY_VERSION_HEX >= 0x030400a1
diff --git a/Cython/Utility/ModuleSetupCode.c b/Cython/Utility/ModuleSetupCode.c
index 6477fb2..75dcdda 100644
--- a/Cython/Utility/ModuleSetupCode.c
+++ b/Cython/Utility/ModuleSetupCode.c
@@ -32,7 +32,7 @@
#define Py_HUGE_VAL HUGE_VAL
#endif
-#ifdef PYPY_VERSION
+#if defined(PYPY_VERSION) || defined(PYSTON_VERSION)
#define CYTHON_COMPILING_IN_PYPY 1
#define CYTHON_COMPILING_IN_CPYTHON 0
#else
-- --
1.9.1 1.9.1
# expected: fail # skip-if: True
# - relies on ctypes
import multiprocessing import multiprocessing
# from https://docs.python.org/2/library/multiprocessing.html # from https://docs.python.org/2/library/multiprocessing.html
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment