diff options
| author | diosmosis <benakamoorthi@fastmail.fm> | 2014-08-12 20:30:47 +0400 |
|---|---|---|
| committer | diosmosis <benakamoorthi@fastmail.fm> | 2014-08-12 20:30:47 +0400 |
| commit | b4277de900c8d152762832dc69d0be4646c182fa (patch) | |
| tree | b541edb15904b6f85941aff7b55b399a7e45a76a /tests/travis | |
| parent | d7ca710f0b0bd55275d0a4d6836fe95b233ed3e5 (diff) | |
Refs #5962, make sure directory is correct for autoupdating travis.yml (directory must be the plugin dir for plugin tests).
Diffstat (limited to 'tests/travis')
| -rwxr-xr-x | tests/travis/autoupdate_travis_yml.sh | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/tests/travis/autoupdate_travis_yml.sh b/tests/travis/autoupdate_travis_yml.sh index de969c3b0b..5f06a0e9df 100755 --- a/tests/travis/autoupdate_travis_yml.sh +++ b/tests/travis/autoupdate_travis_yml.sh @@ -15,14 +15,12 @@ if ! $GENERATE_TRAVIS_YML_COMMAND; then fi if [ "$PLUGIN_NAME" != "" ]; then - EXISTING_YML_PATH=plugins/$PLUGIN_NAME/.travis.yml -else - EXISTING_YML_PATH=.travis.yml + cd plugins/$PLUGIN_NAME fi -echo "Diffing generated with existing (located at $EXISTING_YML_PATH)..." +echo "Diffing generated with existing (located at `pwd`/.travis.yml)..." -diff $EXISTING_YML_PATH generated.travis.yml > /dev/null +diff .travis.yml generated.travis.yml > /dev/null DIFF_RESULT=$? echo "" @@ -71,4 +69,8 @@ if [ "$DIFF_RESULT" -eq "1" ]; then exit 1 else echo ".travis.yml file is up-to-date." +fi + +if [ "$PLUGIN_NAME" != "" ]; then + cd ../.. fi
\ No newline at end of file |