From 1afd42d9872ae0ebfc740d7a87c42498805d8993 Mon Sep 17 00:00:00 2001 From: Chris Boden Date: Sat, 14 Jul 2012 18:52:44 -0400 Subject: [PATCH] PHP 5.4 tests --- Makefile | 5 ++--- README.md | 2 +- tests/AutobahnTestSuite/fuzzingclient-all.json | 4 ++-- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index ade0e17..798a3bb 100644 --- a/Makefile +++ b/Makefile @@ -6,11 +6,10 @@ cover: abtests: ulimit -n 2048 && php tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php & - ulimit -n 2048 && php tests/AutobahnTestSuite/bin/fuzzingserver-stream.php & + ulimit -n 2048 && php54 tests/AutobahnTestSuite/bin/fuzzingserver-stream.php & wstest -m testeeserver -w ws://localhost:8002 & wstest -m fuzzingclient -s tests/AutobahnTestSuite/fuzzingclient-all.json - killall php - killall python + killall php php54 python profile: php -d 'xdebug.profiler_enable=1' tests/AutobahnTestSuite/bin/fuzzingserver-libevent.php & diff --git a/README.md b/README.md index 11fc9f7..a39f11e 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Shell access is required and a dedicated machine with root access is recommended To avoid proxy/firewall blockage it's recommended WebSockets are run on port 80, which requires root access. Note that you can not run two applications (Apache and Ratchet) on the same port, thus the requirement for a separate machine (for now). -PHP 5.3.3 (or higher) is required. If you have access, PHP5.4 is recommended for its performance improvements. +PHP 5.3.4 (or higher) is required. If you have access, PHP 5.4 is *highly* recommended for its performance improvements. Cookies from your domain will be passed to the socket server, allowing you to identify users. Accessing your website's session data in Ratchet requires you to use [Symfony2 Sessions](http://symfony.com/doc/master/components/http_foundation/sessions.html) on your website. diff --git a/tests/AutobahnTestSuite/fuzzingclient-all.json b/tests/AutobahnTestSuite/fuzzingclient-all.json index 5ee7194..3d95f01 100644 --- a/tests/AutobahnTestSuite/fuzzingclient-all.json +++ b/tests/AutobahnTestSuite/fuzzingclient-all.json @@ -3,8 +3,8 @@ , "outdir": "reports/ab" , "servers": [ - {"agent": "Ratchet-libevent/0.2b", "url": "ws://localhost:8000", "options": {"version": 18}} - , {"agent": "Ratchet-stream/0.2b", "url": "ws://localhost:8001", "options": {"version": 18}} + {"agent": "Ratchet/0.2 PHP 5.3-libevent", "url": "ws://localhost:8000", "options": {"version": 18}} + , {"agent": "Ratchet/0.2 PHP 5.4-streams", "url": "ws://localhost:8001", "options": {"version": 18}} , {"agent": "AutobahnTestSuite/0.5.2", "url": "ws://localhost:8002", "options": {"version": 18}} ]