Merge run.py options update from beta

[SVN r61927]

development/running_regression_tests.html

@@ -80,15 +80,17 @@ python run.py ... <strong>--proxy=http://www.someproxy.com:3128</strong>
               <h2>Options</h2>
               <pre>
 commands: cleanup, collect-logs, get-source, get-tools, patch, regression,
-setup, show-revision, test, test-clean, test-process, test-run, update-source,
-upload-logs
+setup, show-revision, test, test-boost-build, test-clean, test-process, test-
+run, update-source, upload-logs
 
-options:
+Options:
   -h, --help            show this help message and exit
   --runner=RUNNER       runner ID (e.g. 'Metacomm')
   --comment=COMMENT     an HTML comment file to be inserted in the reports
   --tag=TAG             the tag for the results
   --toolsets=TOOLSETS   comma-separated list of toolsets to test with
+  --libraries=LIBRARIES
+                        comma separated list of libraries to test
   --incremental         do incremental run (do not remove previous binaries)
   --timeout=TIMEOUT     specifies the timeout, in minutes, for a single test
                         run/compilation
@@ -105,6 +107,7 @@ options:
                         checkout, even when performing a full run
   --have-source         do neither a tarball download nor an SVN update; used
                         primarily for testing script changes
+  --ftp=FTP             FTP URL to upload results to.
   --proxy=PROXY         HTTP proxy server address and port
                         (e.g.'http://www.someproxy.com:3128')
   --ftp-proxy=FTP_PROXY