diff options
| author | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2012-11-01 23:46:04 +0000 |
|---|---|---|
| committer | Peter 'Pita' Martischka <petermartischka@googlemail.com> | 2012-11-01 23:46:04 +0000 |
| commit | c8dfa6d7aed0638b85a685dc5bde5b4d67580f07 (patch) | |
| tree | be22296c6200ce632c3feb5f6b96ef59b6236fbd | |
| parent | b08d948ddd0bf9c56ec7b0eab22b23edde73dbed (diff) | |
| download | etherpad-lite-c8dfa6d7aed0638b85a685dc5bde5b4d67580f07.zip | |
less noise
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rwxr-xr-x | bin/installDeps.sh | 2 | ||||
| -rwxr-xr-x | tests/frontend/travis/sauce_tunnel.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/.travis.yml b/.travis.yml index ea1c90ba..7f7a6396 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,7 +2,7 @@ language: node_js node_js: - "0.8" install: - - "bin/installDeps.sh" + - "bin/installDeps.sh > /dev/null" before_script: - "tests/frontend/travis/sauce_tunnel.sh" script: diff --git a/bin/installDeps.sh b/bin/installDeps.sh index 9f691e0a..eda6df4f 100755 --- a/bin/installDeps.sh +++ b/bin/installDeps.sh @@ -61,7 +61,7 @@ echo "Ensure that all dependencies are up to date..." cd node_modules [ -e ep_etherpad-lite ] || ln -s ../src ep_etherpad-lite cd ep_etherpad-lite - npm install + npm install -s ) || { rm -rf node_modules exit 1 diff --git a/tests/frontend/travis/sauce_tunnel.sh b/tests/frontend/travis/sauce_tunnel.sh index 3f53842b..ac8f7ac7 100755 --- a/tests/frontend/travis/sauce_tunnel.sh +++ b/tests/frontend/travis/sauce_tunnel.sh @@ -4,7 +4,7 @@ curl http://saucelabs.com/downloads/Sauce-Connect-latest.zip > /tmp/sauce.zip unzip /tmp/sauce.zip -d /tmp # start the sauce connector in background and make sure it doesn't output the secret key -(java -jar /tmp/Sauce-Connect.jar $SAUCE_USER $SAUCE_KEY -f /tmp/tunnel | grep -v $SAUCE_KEY)& +(java -jar /tmp/Sauce-Connect.jar $SAUCE_USER $SAUCE_KEY -f /tmp/tunnel > /dev/null )& # save the sauce pid in a file echo $! > /tmp/sauce.pid |