Commit c03d858b authored by Philipp  Trunschke's avatar Philipp Trunschke
Browse files

change default pytest and add test_python3 to CI

parent 11d05867
Pipeline #1435 failed with stages
in 13 minutes and 4 seconds
......@@ -5,8 +5,8 @@ CXX = g++
COMPATIBILITY = -std=c++11
PYTHON2_CONFIG = `python2-config --cflags --ldflags`
PYTHON3_CONFIG = `python3-config --cflags --ldflags`
PYTEST2 = pytest
PYTEST3 = pytest-3
PYTEST2 = python2 -m pytest
PYTEST3 = python3 -m pytest
DEBUG += -g # Adds debug symbols
......@@ -20,6 +20,6 @@ BOOST_LIBS = -lboost_filesystem
OTHER += -I /usr/include/python2.7/ -lboost_python -I/usr/lib64/python2.7/site-packages/numpy/core/include/ -lpython2.7 -fno-var-tracking-assignments
BOOST_PYTHON2 = -lboost_python-py27
BOOST_PYTHON3 = -lboost_python-py35
# BOOST_PYTHON2 = -lboost_python-py27
# BOOST_PYTHON3 = -lboost_python-py35
......@@ -61,10 +61,10 @@ job_test_python2:
script: "g++ --version; cp .gitlab-ci-configs/.config.mk.ci.gcc.python config.mk; make test_python2"
when: always
#job_test_python3:
# stage: test_python3
# script: "g++ --version; cp .config.mk.ci.gcc.python config.mk; make test_python3"
# when: always
job_test_python3:
stage: test_python3
script: "g++ --version; cp .gitlab-ci-configs/.config.mk.ci.gcc.python config.mk; make test_python3"
when: always
job_make_clang:
stage: build_clang
......
......@@ -14,8 +14,8 @@ CXX = g++
# pytest executable(s). If you installed these system-wide you likely don't need to change anything.
PYTHON2_CONFIG = `python2-config --cflags --ldflags`
PYTHON3_CONFIG = `python3-config --cflags --ldflags`
PYTEST2 = pytest2
PYTEST3 = pytest3
PYTEST2 = python2 -m pytest
PYTEST3 = python3 -m pytest
#=================================================================================================
# C++ Version
......
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