Merge pull request #2352 from matthewrmshin/2019.01.x-fix-build

[2019.01.x] Fix Travis CI build

.travis.yml

@@ -8,13 +8,10 @@ python:
 dist: xenial
 
 before_install:
-    - wget 'https://github.com/cylc/cylc-flow/archive/7.8.x.tar.gz' -O '/tmp/cylc-master.tar.gz'
-    - tar -xvf '/tmp/cylc-master.tar.gz' -C "${HOME}"
-    - mv "${HOME}/cylc-flow-7.8.x" "${HOME}/cylc-master"
-    - make -C "${HOME}/cylc-master" 'version'
-    - wget 'https://github.com/metomi/fcm/archive/master.tar.gz' -O '/tmp/fcm-master.tar.gz'
-    - tar -xvf '/tmp/fcm-master.tar.gz' -C "${HOME}"
-    - cat >"${HOME}/.bashrc" <<<"export PATH=${PWD}/bin:${HOME}/fcm-master/bin:${HOME}/cylc-master/bin:\$PATH"
+    - wget 'https://github.com/cylc/cylc-flow/archive/7.8.x.tar.gz' -O - | tar -C "${HOME}" -xz
+    - make -C "${HOME}/cylc-flow-7.8.x" 'version'
+    - wget 'https://github.com/metomi/fcm/archive/master.tar.gz' -O - | tar -C "${HOME}" -xz
+    - echo "export PATH=${PWD}/bin:${HOME}/fcm-master/bin:${HOME}/cylc-flow-7.8.x/bin:\$PATH" >>"${HOME}/.bashrc"
     - source "${HOME}/.bashrc"
     - ssh-keygen -t 'rsa' -f "${HOME}/.ssh/id_rsa" -N '' -q
     - cat "${HOME}/.ssh/id_rsa.pub" >>"${HOME}/.ssh/authorized_keys"

t/rose-app-run/06-namelist.t

@@ -177,8 +177,8 @@ test_teardown
 TEST_KEY=$TEST_KEY_BASE-install-only
 test_setup
 run_pass "$TEST_KEY" rose app-run --config=../config -i --debug
-file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__CONTENT__
-[INFO] export PATH=$PATH
+sort >'expected.out.sorted' <<__CONTENT__
+[INFO] export PATH=${PATH}
 [INFO] install: empty-and-hello.nl
 [INFO]     source: namelist:empty
 [INFO]     source: namelist:hello
@@ -195,6 +195,8 @@ file_cmp "$TEST_KEY.out" "$TEST_KEY.out" <<__CONTENT__
 [INFO]     source: namelist:empty
 [INFO] command: mkdir out && cp *.nl out/
 __CONTENT__
+sort "${TEST_KEY}.out" >"${TEST_KEY}.out.sorted"
+file_cmp "${TEST_KEY}.out" "${TEST_KEY}.out.sorted" 'expected.out.sorted'
 file_cmp "$TEST_KEY.err" "$TEST_KEY.err" </dev/null
 test_teardown
 #-------------------------------------------------------------------------------