From 46541591289e127e2c672e49bafcb463e54b1a9a Mon Sep 17 00:00:00 2001 From: Tobias Oberstein Date: Tue, 21 Mar 2017 17:41:07 +0100 Subject: [PATCH] wip --- wstest/.gitignore | 12 +++-- wstest/Makefile | 101 ++++++++++++++++++++++------------------- wstest/build_pypy3.sh | 10 ---- wstest/build_wstest.sh | 7 --- 4 files changed, 62 insertions(+), 68 deletions(-) delete mode 100644 wstest/build_pypy3.sh delete mode 100644 wstest/build_wstest.sh diff --git a/wstest/.gitignore b/wstest/.gitignore index cc20fda4..57440dcd 100644 --- a/wstest/.gitignore +++ b/wstest/.gitignore @@ -1,4 +1,8 @@ -*.bz2 -./reports -./venv* -./wstest +downloads +reports +venv* +wstest +pypy2 +pypy3 +cpy2 +cpy3 diff --git a/wstest/Makefile b/wstest/Makefile index 58c91748..18878b62 100644 --- a/wstest/Makefile +++ b/wstest/Makefile @@ -1,76 +1,83 @@ -fuzzingserver: - ./wstest/bin/wstest -m fuzzingserver +default: + @echo 'targets: clean, downloads, build_wstest' clean: -rm -rf ./reports -rm -rf ./downloads - -rm -rf ./venv + -rm -rf ./venv* + -rm -rf ./wstest -download: +clean_reports: + -rm -rf ./reports + +downloads: mkdir -p downloads - cd downloads wget -P downloads https://bootstrap.pypa.io/get-pip.py wget -P downloads https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux64.tar.bz2 wget -P downloads https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.0-linux64.tar.bz2 + wget -P downloads https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tar.xz wget -P downloads https://www.python.org/ftp/python/3.6.0/Python-3.6.0.tar.xz -build_wstest: - -rm -rf ./wstest +setup_wstest: mkdir -p ./wstest - tar xvf ./pypy2-v5.7.0-linux64.tar.bz2 --strip-components=1 -C ./wstest - ./wstest/bin/pypy get-pip.py + tar xvf ./downloads/pypy2-v5.7.0-linux64.tar.bz2 --strip-components=1 -C ./wstest + ./wstest/bin/pypy ./downloads/get-pip.py + ./wstest/bin/pip install autobahntestsuite + +wstest_server: + ./wstest/bin/wstest -m fuzzingserver +setup_pypy2: + mkdir -p ./pypy2 + tar xvf ./downloads/pypy2-v5.7.0-linux64.tar.bz2 --strip-components=1 -C ./pypy2 + cd ./pypy2/bin && ln -s pypy python && cd ../.. + ./pypy2/bin/python ./downloads/get-pip.py + ./pypy2/bin/pip install virtualenv + ./pypy2/bin/python -V -# CPython 2 +setup_pypy3: + mkdir -p ./pypy3 + tar xvf ./downloads/pypy3-v5.7.0-linux64.tar.bz2 --strip-components=1 -C ./pypy3 + cd ./pypy3/bin && ln -s pypy3 python && cd ../.. + ./pypy3/bin/python ./downloads/get-pip.py + ./pypy3/bin/pip install virtualenv + ./pypy3/bin/python -V -# PyPy 2 +setup_pypy2_tx_client: + ./pypy2/bin/virtualenv ./venv_pypy2_tx_client + ./venv_pypy2_tx_client/bin/pip install -e ..[twisted] -setup_client_pypy2_tx: - ./pypy2-v5.7.0-linux64/bin/virtualenv ./venv_client_pypy2_tx - ./venv_client_pypy2_tx/bin/pip install -e ..[twisted] +setup_pypy2_aio_client: + ./pypy2/bin/virtualenv ./venv_pypy2_aio_client + ./venv_pypy2_aio_client/bin/pip install -e ..[asyncio] -setup_client_pypy2_aio: - ./pypy2-v5.7.0-linux64/bin/virtualenv ./venv_client_pypy2_aio - ./venv_client_pypy2_aio/bin/pip install -e ..[asyncio] +setup_pypy3_tx_client: + ./pypy3/bin/virtualenv ./venv_pypy3_tx_client + ./venv_pypy3_tx_client/bin/pip install -e ..[twisted] -# PyPy 3 - -setup_client_pypy3_tx: - ./pypy3/bin/virtualenv ./venv_client_pypy3_tx - ./venv_client_pypy3_tx/bin/pip install -e ..[twisted] - -setup_client_pypy3_aio: - ./pypy3/bin/virtualenv ./venv_client_pypy3_aio - ./venv_client_pypy3_aio/bin/pip install -e ..[asyncio] +setup_pypy3_aio_client: + ./pypy3/bin/virtualenv ./venv_pypy3_aio_client + ./venv_pypy3_aio_client/bin/pip install -e ..[asyncio] -# ALL +test_pypy2_tx_client: + ./venv_pypy2_tx_client/bin/python testee_client_tx.py -setup: setup_client_pypy3_tx setup_client_pypy3_aio +test_pypy2_aio_client: + ./venv_pypy2_aio_client/bin/python testee_client_aio.py +test_pypy3_tx_client: + ./venv_pypy3_tx_client/bin/python testee_client_tx.py - - -test_client_pypy3_tx: - ./venv_client_pypy3_tx/bin/python testee_client_tx.py - -test_client_pypy3_aio: - ./venv_client_pypy3_aio/bin/python testee_client_aio.py - - -test_client_pypy2_tx: - ./venv_client_pypy2_twisted/bin/python testee_client_tx.py - -test_client_pypy2_aio: - ./venv_client_pypy2_aio/bin/python testee_client_aio.py - +test_pypy3_aio_client: + ./venv_pypy3_tx_client/bin/python testee_client_aio.py test: \ - test_client_pypy2_tx \ - test_client_pypy3_tx + test_pypy2_tx_client \ + test_pypy3_tx_client broken: \ - test_client_pypy2_aio \ - test_client_pypy3_aio + test_pypy2_aio_client \ + test_pypy3_aio_client diff --git a/wstest/build_pypy3.sh b/wstest/build_pypy3.sh deleted file mode 100644 index a16187ba..00000000 --- a/wstest/build_pypy3.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/sh - -wget https://bitbucket.org/pypy/pypy/downloads/pypy3-v5.7.0-linux64.tar.bz2 -mkdir -p ./pypy3 -tar xvf ./pypy3-v5.7.0-linux64.tar.bz2 --strip-components=1 -C ./pypy3 -wget https://bootstrap.pypa.io/get-pip.py -cd ./pypy3/bin && ln -s pypy3 python && cd ../.. -./pypy3/bin/python -V -./pypy3/bin/python get-pip.py -./pypy3/bin/pip install virtualenv diff --git a/wstest/build_wstest.sh b/wstest/build_wstest.sh deleted file mode 100644 index 406ecc4d..00000000 --- a/wstest/build_wstest.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -wget https://bitbucket.org/pypy/pypy/downloads/pypy2-v5.7.0-linux64.tar.bz2 -mkdir -p ./wstest -tar xvf ./pypy2-v5.7.0-linux64.tar.bz2 --strip-components=1 -C ./wstest -wget https://bootstrap.pypa.io/get-pip.py -./wstest/bin/pypy get-pip.py