wip

wstest/.gitignore

@@ -1,4 +1,8 @@
-*.bz2
+downloads
-./reports
+reports
-./venv*
+venv*
-./wstest
+wstest
+pypy2
+pypy3
+cpy2
+cpy3

wstest/Makefile

@@ -1,76 +1,83 @@
-fuzzingserver:
+default:
-	./wstest/bin/wstest -m fuzzingserver
+	@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:
+setup_wstest:
-	-rm -rf ./wstest
 	mkdir -p ./wstest
-	tar xvf ./pypy2-v5.7.0-linux64.tar.bz2 --strip-components=1 -C ./wstest
+	tar xvf ./downloads/pypy2-v5.7.0-linux64.tar.bz2 --strip-components=1 -C ./wstest
-	./wstest/bin/pypy get-pip.py
+	./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:
+setup_pypy2_aio_client:
-	./pypy2-v5.7.0-linux64/bin/virtualenv ./venv_client_pypy2_tx
+	./pypy2/bin/virtualenv ./venv_pypy2_aio_client
-	./venv_client_pypy2_tx/bin/pip install -e ..[twisted]
+	./venv_pypy2_aio_client/bin/pip install -e ..[asyncio]
 
-setup_client_pypy2_aio:
+setup_pypy3_tx_client:
-	./pypy2-v5.7.0-linux64/bin/virtualenv ./venv_client_pypy2_aio
+	./pypy3/bin/virtualenv ./venv_pypy3_tx_client
-	./venv_client_pypy2_aio/bin/pip install -e ..[asyncio]
+	./venv_pypy3_tx_client/bin/pip install -e ..[twisted]
 
-# PyPy 3
+setup_pypy3_aio_client:
-
+	./pypy3/bin/virtualenv ./venv_pypy3_aio_client
-setup_client_pypy3_tx:
+	./venv_pypy3_aio_client/bin/pip install -e ..[asyncio]
-	./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]
 
 
-# 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_pypy3_aio_client:
-
+	./venv_pypy3_tx_client/bin/python testee_client_aio.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: \
-	test_client_pypy2_tx \
+	test_pypy2_tx_client \
-	test_client_pypy3_tx
+	test_pypy3_tx_client
 
 broken: \
-	test_client_pypy2_aio \
+	test_pypy2_aio_client \
-	test_client_pypy3_aio
+	test_pypy3_aio_client

wstest/build_pypy3.sh

@@ -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

wstest/build_wstest.sh

@@ -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