gnucash master: Multiple changes pushed

[Geert Janssens]

Updated	 via  https://github.com/Gnucash/gnucash/commit/c0f3147a (commit)
	 via  https://github.com/Gnucash/gnucash/commit/28668ec5 (commit)
	 via  https://github.com/Gnucash/gnucash/commit/1e7c721e (commit)
	from  https://github.com/Gnucash/gnucash/commit/098c1950 (commit)



commit c0f3147a3e9cb5dcc8088f5f6d4ae9bbd6b03c43
Merge: 098c195 28668ec
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Sep 2 16:18:23 2017 +0200

    Merge branch 'maint'
    
    Resolved conflicts:
    	.travis.yml

commit 28668ec5947cc775dc5ce2f80c16ca0d0013a486
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Sep 2 16:03:46 2017 +0200

    Fix deliberate test failure on previous commit

commit 1e7c721e8d2f61d1b90c5400eb9bfe042544a960
Author: Geert Janssens <geert at kobaltwit.be>
Date:   Sat Sep 2 12:35:28 2017 +0200

    Have Travis print out build logs in case of test failures
    
    To get the after_failure line work, I had to move the inline
    build script to a separate script (util/travis-script.sh)
    
    The second script (util/travis-after-failure.sh) will output
    LastTest.log for cmake based builds and all files named
    test*.log for an autotools based build.
    
    Note: this commit also comes with a delibarate test failure
    to illustrate the Travis behaviour. It will be removed in the
    next commit.



Summary of changes:
 .travis.yml                  | 30 ++----------------------------
 util/travis-after-failure.sh | 19 +++++++++++++++++++
 util/travis-script.sh        | 30 ++++++++++++++++++++++++++++++
 3 files changed, 51 insertions(+), 28 deletions(-)
 create mode 100755 util/travis-after-failure.sh
 create mode 100755 util/travis-script.sh