Travis: clean scripts

Clement Champetier · Clement Champetier · commit 9e586f546b21 · 2015-09-28T14:39:59.000+02:00
set -x: print commands and their arguments as they are executed.
diff --git a/.travis.yml b/.travis.yml
@@ -21,6 +21,7 @@ env:
     - DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=false
 
 matrix:
+  # generate coverage only with gcc
   exclude:
     - compiler: clang
       env: DEPENDENCY_MODE=ffmpeg ENABLE_COVERAGE=true
@@ -50,11 +51,9 @@ script:
   - ./tools/travis.build.sh
 
   # launch tests
-  - if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./../tools/travis.python.nosetests.sh; fi
+  - if [ ${DEPENDENCY_MODE} = "ffmpeg" ]; then ./tools/travis.python.nosetests.sh; fi
 
 after_success:
-  - cd ${TRAVIS_BUILD_DIR}
-
   # generate coverage for coveralls
   - if [ ${ENABLE_COVERAGE} ]; then ./tools/travis.gcc.generate.coverage.sh; fi
 
diff --git a/tools/travis.build.sh b/tools/travis.build.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Print commands and their arguments as they are executed.
+set -x
+
 # Create directory of build
 mkdir -p ${AVTRANSCODER_BUILD}
 cd ${AVTRANSCODER_BUILD}
diff --git a/tools/travis.gcc.generate.coverage.sh b/tools/travis.gcc.generate.coverage.sh
@@ -1,3 +1,8 @@
+#!/bin/bash
+
+# Print commands and their arguments as they are executed.
+set -x
+
 # capture coverage info
 lcov --capture --directory ${AVTRANSCODER_BUILD} --output-file coverage.info
 
diff --git a/tools/travis.gcc.install.coverage.sh b/tools/travis.gcc.install.coverage.sh
@@ -1,3 +1,8 @@
+#!/bin/bash
+
+# Print commands and their arguments as they are executed.
+set -x
+
 # install latest LCOV (1.9 was failing for me)
 wget http://ftp.de.debian.org/debian/pool/main/l/lcov/lcov_1.11.orig.tar.gz
 tar xf lcov_1.11.orig.tar.gz
diff --git a/tools/travis.linux.install.deps.sh b/tools/travis.linux.install.deps.sh
@@ -1,4 +1,8 @@
 #!/bin/bash
+
+# Print commands and their arguments as they are executed.
+set -x
+
 lsb_release -a
 
 sudo apt-add-repository "deb http://archive.ubuntu.com/ubuntu trusty main restricted universe multiverse"
diff --git a/tools/travis.osx.install.deps.sh b/tools/travis.osx.install.deps.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Print commands and their arguments as they are executed.
+set -x
+
 brew update
 
 brew install gcc cmake swig
diff --git a/tools/travis.python.nosetests.sh b/tools/travis.python.nosetests.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+# Print commands and their arguments as they are executed.
+set -x
+
 # Get avtranscoder library
 export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${DEPENDENCY_INSTALL}/lib
 export PYTHONPATH=${AVTRANSCODER_INSTALL}/lib/python2.7/site-packages/:$PYTHONPATH
