diff --git a/toolset/README.md b/toolset/README.md index 7adb36da5e8..6d359bde73e 100644 --- a/toolset/README.md +++ b/toolset/README.md @@ -10,7 +10,7 @@ For deployment instructions, refer to the [Benchmark Suite Deployment README fil Assuming the deployment finished without error, we're ready to start the test suite. On the Linux server host, type: - nohup toolset/run-tests.py -s server-private-ip -c client-private-ip -u username -i path-to-private-ssh-key --max-threads number-of-cores & + nohup toolset/run-tests.py -s server-private-ip -d database-private-ip -c client-private-ip -i path-to-private-ssh-key -u username --max-threads 8 --duration 15 & For the number-of-cores parameter, you will need to know your application server's core count. For example, Amazon EC2 large instances have 2 cores. @@ -22,19 +22,23 @@ The test results are saved in the `results` directory, as described below. ## Running the test suite on Windows -To run the test suite on the Windows server, log on the server, open the PowerShell command line environment and type a command like: +To run the test suite using Windows as the application server and Linux as the database server, log on to the server, open the PowerShell command line environment and type a command like: - python toolset\run-tests.py -s server-ip -c client-ip -i path-to-ssh-key --max-threads cores --duration 30 --sleep 5 --name win --test aspnet --type all + python toolset/run-tests.py -s server-private-ip -d database-private-ip -c client-private-ip -i path-to-private-ssh-key -u username --max-threads 8 --duration 15 --os windows --sleep 5 --name win + +To run the test suite using Windows as the application server and Windows as the database server, use this instead: + + python toolset/run-tests.py -s server-private-ip -d database-private-ip -c client-private-ip -i path-to-private-ssh-key -u username --max-threads 8 --duration 15 --os windows --database-os windows --name win ## Specifying the machine name If you use a different configuration than two m1.large instances, please use the --name option to name the results appropriately. - nohup toolset/run-tests.py -s server-private-ip -c client-private-ip -u username -i path-to-private-ssh-key --max-threads cores --name ec2-servertype-clienttype & + nohup toolset/run-tests.py -s server-private-ip -d database-private-ip -c client-private-ip -u username -i path-to-private-ssh-key --max-threads cores --name ec2-servertype-clienttype & So if you were running an m1.large and an m1.medium, it would look like this: - nohup toolset/run-tests.py -s server-private-ip -c client-private-ip -u username -i path-to-private-ssh-key --max-threads cores --name ec2-m1.large-m1.medium & + nohup toolset/run-tests.py -s server-private-ip -d database-private-ip -c client-private-ip -u username -i path-to-private-ssh-key --max-threads cores --name ec2-m1.large-m1.medium & This will allow us to differentiate results. @@ -42,7 +46,7 @@ This will allow us to differentiate results. If you are making changes to any of the tests, or you simply want to verify a single test, you can run the script with the --test flag. For example, if you only wanted to run the JRuby tests: - nohup toolset/run-tests.py -s server-ip -c client-ip -u username -i path-to-private-ssh-key --max-threads cores --name unique-machine-name --test rack-jruby sinatra-jruby rails-jruby + nohup toolset/run-tests.py -s server-private-ip -d database-private-ip -c client-private-ip -u username -i path-to-private-ssh-key --max-threads cores --name unique-machine-name --test rack-jruby sinatra-jruby rails-jruby ## Result Files