Skip to content

Commit f57599e

Browse files
committed
Fixed bug#46445 (run-tests2.php is missing or README.TESTING2 is unneeded)
1 parent e15cb4d commit f57599e

File tree

1 file changed

+14
-14
lines changed

1 file changed

+14
-14
lines changed

Diff for: README.TESTING2

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,24 +1,24 @@
11
[IMPORTANT NOTICE]
22
------------------
33
This is an addendum to README.TESTING with additional information
4-
specific to run-tests2.php.
4+
specific to server-tests.php.
55

6-
run-tests2.php is backward compatible with tests developed for
7-
the original run-tests.php script. run-tests2 is *not* used by
8-
'make test'. run-tests2 was developed to provide support for
6+
server-tests.php is backward compatible with tests developed for
7+
the original run-tests.php script. server-tests is *not* used by
8+
'make test'. server-tests was developed to provide support for
99
testing PHP under it's primary environment, HTTP, and can run the
1010
PHP tests under any of the SAPI modules that are direct executables,
1111
or are accessable via HTTP.
1212

1313
[New features]
1414
----------------
1515
* Command line interface:
16-
You can run 'php run-tests2.php -h' to get all the possible options.
16+
You can run 'php server-tests.php -h' to get all the possible options.
1717
* Configuration file:
1818
the -c argument will allow you to use a configuration file. This is
1919
handy if you are testing multiple environments and need various options
2020
depending on the environment.
21-
see run-tests-config.php for details.
21+
see server-tests-config.php for details.
2222
* CGI Emulation:
2323
Will emulate a CGI environment when testing with the cgi sapi executable.
2424
* HTTP testing:
@@ -39,31 +39,31 @@ make testing work.
3939
Some (but not all!) examples of usage:
4040

4141
1. run tests from the php source directory
42-
php run-tests2.php -p /path/to/php-cli
42+
php server-tests.php -p /path/to/php-cli
4343

4444
2. run tests using cgi emulation
45-
php run-tests2.php -p /path/to/php-cgi
45+
php server-tests.php -p /path/to/php-cgi
4646

4747
3. run tests over http, copying test files into document root
48-
php run-tests2.php -w -u http://localhost/test -m /path/to/htdocs/test
48+
php server-tests.php -w -u http://localhost/test -m /path/to/htdocs/test
4949

5050
4. run tests over http, php sources have been aliased in web server
51-
php run-tests2.php -w -u http://localhost/test
51+
php server-tests.php -w -u http://localhost/test
5252

5353
5. run tests using configuration file
54-
php run-tests2.php -c /path/to/run-tests-config.php
54+
php server-tests.php -c /path/to/server-tests-config.php
5555

5656
6. run tests using configuration file, but overriding some settings:
5757
(config file must be first)
58-
php run-tests2.php -c /path/to/run-tests-config.php -w -t 3 -d /path/to/testdir
58+
php server-tests.php -c /path/to/server-tests-config.php -w -t 3 -d /path/to/testdir
5959

6060
NOTE: configuration as described in README.TESTING still works.
6161

6262
[New Test Sections]
6363
----------------
6464
In addition to the traditional test sections
6565
(see http://qa.php.net/write-test.php), several new sections are available
66-
under run-tests2.
66+
under server-tests.
6767

6868
--POST--
6969
This is not a new section, but not multipart posts are supported for testing
@@ -97,7 +97,7 @@ include:
9797
$scriptname this is what will become SCRIPT_NAME unless you override it
9898
$docroot the equivelant of DOCUMENT_ROOT under Apache
9999
$cwd the directory that the test is being initiated from
100-
$this->conf all run-tests2 configuration vars
100+
$this->conf all server-tests configuration vars
101101
$this->env all environment variables that will get passed to the test
102102

103103

0 commit comments

Comments
 (0)