Bug 978038 - Add verbose flag to make test-integration. r=gaye

README.md

@@ -82,7 +82,16 @@ for this to work predictably.
 
 Shared code for tests lives under shared/test/integration.
 
-#### Invoking a test
+#### Running integration tests
+
+NOTE: unless your tests end in _test.js they will not be
+automatically picked up by `make test-integration`.
+
+```sh
+make test-integration
+```
+
+#### Invoking a test file
 
 ```sh
 make test-integration TEST_FILES=<test>
@@ -106,14 +115,6 @@ make test-integration APP=<APP>
 
 For example, we could run all tests for the calendar app with `make test-integration APP=calendar`.
 
-#### Invoking all the tests
-
-NOTE: unless you tests end in _test.js they will not be
-automatically picked up by `make test-integration`.
-
-```sh
-make test-integration
-```
 #### Running tests while working
 
 If you wish to run many tests in background you might not want to be disturbed
@@ -137,6 +138,14 @@ You can of course combine both:
 PULSE_SERVER=":" xvfb-run make test-integration
 ```
 
+#### Debugging Tests
+
+To view log out from a test
+
+```sh
+make test-integration VERBOSE=1
+```
+
 #### Where to find documentation
   - [Node.js](http://nodejs.org)
 

bin/gaia-marionette

@@ -74,9 +74,16 @@ fi
 # find xpcshell and put it in the path
 XPCSHELL_DIR=$(dirname $(find "$XULRUNNER_DIRECTORY"/bin -type f -name "xpcshell" | head -n 1));
 
+
+VERBOSE_OPTS=""
+if [ "$VERBOSE" ]; then
+    VERBOSE_OPTS="--verbose"
+fi
+
 # wrap marionette-mocha with gaia's defaults. We also need to alter the paths to
 # xpcshell in available for email fake servers.
 PATH=$XPCSHELL_DIR:$PATH $DIR/../node_modules/.bin/marionette-mocha \
+  $VERBOSE_OPTS \
   --timeout 60s \
   --ui tdd \
   --profile-builder $SHARED/profile_builder.js \