Travis fixes

This commit is contained in:
Georg Richter
2020-11-18 18:15:26 +01:00
parent 26ca93492f
commit 90ce14c8eb
2 changed files with 13 additions and 14 deletions

View File

@ -54,11 +54,10 @@ matrix:
# - env: DB=mariadb:10.4 PYTHON_VER="pypy3.6-7.3.1"
- env: DB=mariadb:10.4 BENCH=1
- env: DB=mariadb:10.4 PYTHON_VER="3.6.0" MAXSCALE_VERSION=2.2.9 TEST_PORT=4007 TEST_USER=bob TEXT_DATABASE=test2 SKIP_LEAK=1
- env: DB=mariadb:10.1 PYTHON_VER="3.6.0" TEST_RESET_SESSION=0
- env: DB=mariadb:10.2 PYTHON_VER="3.6.0"
- env: DB=mariadb:10.3 PYTHON_VER="3.6.0"
- env: DB=mysql:5.6 PYTHON_VER="3.6.0" TEST_RESET_SESSION=0
- env: DB=mysql:5.7 PYTHON_VER="3.6.0"
- env: DB=mysql:8.0 PYTHON_VER="3.6.0"
notifications:
email: false

View File

@ -68,7 +68,7 @@ else
fi
if [ -n "$BENCH" ] ; then
pyenv install pypy3.6-7.2.0
# pyenv install pypy3.6-7.2.0
# pyenv install miniconda3-4.3.30
pyenv install 3.8.0
@ -96,17 +96,17 @@ if [ -n "$BENCH" ] ; then
# python -m pyperf compare_to mysql_bench_miniconda3_4_3_30.json mariadb_bench_miniconda3_4_3_30.json --table
export PYENV_VERSION=pypy3.6-7.2.0
python setup.py build
python setup.py install
pip install mysql-connector-python pyperf
cd testing
export TEST_MODULE=mariadb
python bench.py -o mariadb_bench_pypy3_6.json --inherit-environ=TEST_USER,TEST_HOST,TEST_PORT
export TEST_MODULE=mysql.connector
python bench.py -o mysql_bench_pypy3_6.json --inherit-environ=TEST_USER,TEST_HOST,TEST_PORT
python -m pyperf compare_to mysql_bench_pypy3_6.json mariadb_bench_pypy3_6.json --table
cd ..
# export PYENV_VERSION=pypy2.6-7.2.0
# python setup.py build
# python setup.py install
# pip install mysql-connector-python pyperf
# cd testing
# export TEST_MODULE=mariadb
# python bench.py -o mariadb_bench_pypy3_6.json --inherit-environ=TEST_USER,TEST_HOST,TEST_PORT
# export TEST_MODULE=mysql.connector
# python bench.py -o mysql_bench_pypy3_6.json --inherit-environ=TEST_USER,TEST_HOST,TEST_PORT
# python -m pyperf compare_to mysql_bench_pypy3_6.json mariadb_bench_pypy3_6.json --table
# cd ..
# python -m pyperf compare_to mysql_bench.json mariadb_bench.json mysql_bench_pypy3_6.json mariadb_bench_pypy3_6.json \
# mysql_bench_miniconda3_4_3_30.json mariadb_bench_miniconda3_4_3_30.json --table