summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordkf <donal.k.fellows@manchester.ac.uk>2019-07-02 09:13:59 (GMT)
committerdkf <donal.k.fellows@manchester.ac.uk>2019-07-02 09:13:59 (GMT)
commit8751d32304e4dd09c8f1dc3e4d815c998c265851 (patch)
treeac5e61cc0c2be0feb78a12d2056da3f9179272c8
parentac198c7f44d124a41be48bb37a2cd41500303423 (diff)
downloadtcl-8751d32304e4dd09c8f1dc3e4d815c998c265851.zip
tcl-8751d32304e4dd09c8f1dc3e4d815c998c265851.tar.gz
tcl-8751d32304e4dd09c8f1dc3e4d815c998c265851.tar.bz2
So... you can't directly override a script in the matrix section of .travis.yml
-rw-r--r--.travis.yml7
1 files changed, 3 insertions, 4 deletions
diff --git a/.travis.yml b/.travis.yml
index a79bbed..20f60f0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -161,8 +161,7 @@ matrix:
env:
- BUILD_DIR=win
- NO_DIRECT_CONFIGURE=1
- script:
- - nmake -f makefile.vc test
+ - MAKE="nmake -f makefile.vc"
before_install:
- export ERROR_ON_FAILURES=1
@@ -170,6 +169,6 @@ before_install:
install:
- test -n "$NO_DIRECT_CONFIGURE" || ./configure ${CFGOPT}
script:
- - make
+ - ${MAKE:-make}
# The styles=develop avoids some weird problems on OSX
- - test -n "$NO_DIRECT_TEST" || make test styles=develop
+ - test -n "$NO_DIRECT_TEST" || ${MAKE:-make} test styles=develop