README.md

@@ -21,6 +21,19 @@ or chat with us on [Freenode](https://freenode.net/faq.shtml#whatwhy) at `#teche

[Setup a development environment](deployment), typically by using a 
remote server dedicated to this project or by using a virtual machine. 
Here's a short example: 
    
```
# Clone the project, then move into the right directory
$ cd ~/FrameworkBenchmarks/deployment/vagrant-development
# Turn on the VM. Takes at least 20 minutes
$ vagrant up
# Enter the VM, then run a test
$ vagrant ssh
vagrant@TFB-all:~$ cd ~/FrameworkBenchmarks
vagrant@TFB-all:~/FrameworkBenchmarks$ toolset/run-tests.py --install server --mode verify --test beego
```

Then enable Travis-CI on your project fork, so that any commits you send
to Github are automatically verified for correctness (e.g. meeting all 
[benchmark requirements](http://www.techempower.com/benchmarks/#section=code)). 
@@ -127,7 +140,7 @@ toolset/run-tests.py --install server --verbose --install-only
You can easily list all available tests

```
╰─$ toolset/run-tests.py --list-tests
$ toolset/run-tests.py --list-tests
activeweb
activeweb-raw
aspnet

deployment/vagrant-common/core.rb

@@ -90,9 +90,8 @@ def provider_virtualbox(config, role)
      vb.gui = true
    end

    if ENV.fetch('TFB_VB_MEM', 2048)
      vb.customize ["modifyvm", :id, "--memory", "2048"]
    end
    vb.memory = ENV.fetch('TFB_VB_MEM', 2048)
    vb.cpus = ENV.fetch('TFB_VB_CPU', 2)

    override.vm.synced_folder "../..", "/FrameworkBenchmarks"

deployment/vagrant-virtualbox/README.md

@@ -9,4 +9,4 @@ that modify how TFB launches your Virtuabox virtual machines.
| `TFB_VB_SHOW`                    | `true,false`        | Show the VM in a window when running? Default is false
| `TFB_VB_ARCH`                    | `64,32`             | Used to force TFB to run a 32-bit virtual machine. This is unsupported, as many of the framework binaries we download are 64-bit only and will not launch. If you cannot run a 64-bit VM, then we recommend using the Amazon AWS provider instead of using this variable
| `TFB_VB_MEM`                     | `<number>` e.g. `2048` | Size of VM's RAM in MB. Default is `2048`

| `TFB_VB_CPU`                     | `<number>` e.g. `2` | Number of host CPUs that the VM can access

frameworks/Ruby/sinatra/install.sh

@@ -1,6 +1,6 @@
#!/bin/bash

fw_depends rvm nginx java
fw_depends rvm nginx java maven

rvm install ruby-2.0.0-p0
rvm ruby-2.0.0-p0 do bundle install --gemfile=$TROOT/Gemfile

toolset/benchmark/benchmarker.py

@@ -466,11 +466,10 @@ def __run_tests(self, tests):
    else:
      logging.debug("Executing __run_tests on Linux")

      logging.info("Running %s" % tests)
      # Setup a nice progressbar and ETA indicator
      widgets = [self.mode, ': ',  progressbar.Percentage(), 
                 ' ', progressbar.Bar(),
                 ' Full ', progressbar.ETA()]
                 ' Rough ', progressbar.ETA()]
      pbar = progressbar.ProgressBar(widgets=widgets, maxval=len(tests)).start()
      pbar_test = 0

toolset/setup/linux/systools/maven.sh

@@ -1,7 +1,9 @@
#!/bin/bash

RETCODE=$(fw_exists /usr/bin/mvn)
RETCODE=$(fw_exists maven.installed)
[ ! "$RETCODE" == 0 ] || { return 0; }

sudo apt-get -y install maven -qq
sudo apt-get -y install maven
mvn -version

touch maven.installed