From 081b7773c30e601cf1e586c4450da7f452f4027e Mon Sep 17 00:00:00 2001 From: Clemens Lang Date: Wed, 2 Sep 2015 20:58:54 +0200 Subject: [PATCH] tests: Switch default shell to bash Keep using bash -x in travis build jobs for debugging purposes, though. This is done by making SHELL configurable from the command line. --- .travis.yml | 2 +- test/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index cdcc871..182d83e 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,4 @@ install: - curl -L "http://archive.ubuntu.com/ubuntu/pool/universe/s/shellcheck/shellcheck_0.3.7-1_amd64.deb" -o "/tmp/shellcheck_0.3.7-1_amd64.deb" - '[ "$(openssl dgst -sha256 "/tmp/shellcheck_0.3.7-1_amd64.deb" | cut -d " " -f 2)" == "1622b0ebead82475946188c7ace2afe012607c1b064d2888556f296a28cd1927" ]' - sudo dpkg -i "/tmp/shellcheck_0.3.7-1_amd64.deb" -script: make && make test +script: make && make test SHELL="bash -x" diff --git a/test/Makefile b/test/Makefile index 4ab2373..03a318a 100644 --- a/test/Makefile +++ b/test/Makefile @@ -3,7 +3,7 @@ TUT=../../google-font-download # tests use bashisms, avoid failures on systems where dash is used # to simplify debugging failing test cases, use -x -SHELL=bash -x +SHELL := bash .PHONY: test $(TESTS)