From 2c70f4edf76812c01e511161f2e52c676810ab8a Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 20 Jan 2016 16:42:58 +0100 Subject: [PATCH 1/2] [DOCUMENTATION] Update tests README --- tests/README.markdown | 35 +++++++++++++++++------------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/tests/README.markdown b/tests/README.markdown index c1027aced..45e32c237 100644 --- a/tests/README.markdown +++ b/tests/README.markdown @@ -1,25 +1,24 @@ # Running the Doctrine 2 Testsuite -## Setting up a PHPUnit Configuration XML +To execute the Doctrine2 testsuite, you just need to execute this simple steps: -.. + * Clone the project from GitHub + * Enter the Doctrine2 folder + * Install the dependencies + * Execute the tests + + All this is (normally) done with: -## Testing Lock-Support +``` +git clone git@github.com:doctrine/doctrine2.git +cd doctrine2 +composer install +./vendor/bin/phpunit +``` -The Lock support in Doctrine 2 is tested using Gearman, which allows to run concurrent tasks in parallel. -Install Gearman with PHP as follows: +## Pre-requisites +Doctrine2 works on many database vendors; the tests can detect the presence of installed vendors, but you need at least one of those; the easier to install is SQLite. -1. Go to http://www.gearman.org and download the latest Gearman Server -2. Compile it and then call ldconfig -3. Start it up "gearmand -vvvv" -4. Install pecl/gearman by calling "gearman-beta" +If you're using a Debian-derivative Linux distribution, you can install SQLite with: -You can then go into tests/ and start up two workers: - - php Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php - -Then run the locking test-suite: - - phpunit --configuration Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php - -This can run considerable time, because it is using sleep() to test for the timing ranges of locks. \ No newline at end of file + sudo apt-get install sqlite From 1e97cf21e8e3253ade0f8cd359c6cdf1b8617ce4 Mon Sep 17 00:00:00 2001 From: Alessandro Lai Date: Wed, 20 Jan 2016 16:52:13 +0100 Subject: [PATCH 2/2] Reverting removal of lock tests paragraph; minor fixes --- tests/README.markdown | 32 +++++++++++++++++++++++++------- 1 file changed, 25 insertions(+), 7 deletions(-) diff --git a/tests/README.markdown b/tests/README.markdown index 45e32c237..dfba6fa21 100644 --- a/tests/README.markdown +++ b/tests/README.markdown @@ -9,16 +9,34 @@ To execute the Doctrine2 testsuite, you just need to execute this simple steps: All this is (normally) done with: -``` -git clone git@github.com:doctrine/doctrine2.git -cd doctrine2 -composer install -./vendor/bin/phpunit -``` + git clone git@github.com:doctrine/doctrine2.git + cd doctrine2 + composer install + ./vendor/bin/phpunit ## Pre-requisites Doctrine2 works on many database vendors; the tests can detect the presence of installed vendors, but you need at least one of those; the easier to install is SQLite. -If you're using a Debian-derivative Linux distribution, you can install SQLite with: +If you're using Debian, or a Debian-derivate Linux distribution (like Ubuntu), you can install SQLite with: sudo apt-get install sqlite + +## Testing Lock-Support + +The Lock support in Doctrine 2 is tested using Gearman, which allows to run concurrent tasks in parallel. +Install Gearman with PHP as follows: + +1. Go to http://www.gearman.org and download the latest Gearman Server +2. Compile it and then call ldconfig +3. Start it up "gearmand -vvvv" +4. Install pecl/gearman by calling "gearman-beta" + +You can then go into `tests/` and start up two workers: + + php Doctrine/Tests/ORM/Functional/Locking/LockAgentWorker.php + +Then run the locking test-suite: + + phpunit --configuration Doctrine/Tests/ORM/Functional/Locking/GearmanLockTest.php + +This can run considerable time, because it is using sleep() to test for the timing ranges of locks.