From 34f979744829cddbad4b3ae58b07af8976ec1f23 Mon Sep 17 00:00:00 2001 From: ttroy50 Date: Sun, 14 Feb 2016 11:48:12 +0000 Subject: [PATCH] fix travis tests --- 01-basic/I-compiling-with-clang/run_test.sh | 2 +- test.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/01-basic/I-compiling-with-clang/run_test.sh b/01-basic/I-compiling-with-clang/run_test.sh index 56c8965..e861836 100755 --- a/01-basic/I-compiling-with-clang/run_test.sh +++ b/01-basic/I-compiling-with-clang/run_test.sh @@ -2,7 +2,7 @@ # Ubuntu supports multiple versions of clang to be installed at the same time. # The tests need to determin the clang binary before calling cmake clang_bin=`which clang` -clang_xx_bin="clang++" +clang_xx_bin="which clang++" if [ -z $clang_bin ]; then clang_ver=`dpkg --get-selections | grep clang | grep -v -m1 libclang | cut -f1 | cut -d '-' -f2` diff --git a/test.sh b/test.sh index bcd689c..78eb8e1 100755 --- a/test.sh +++ b/test.sh @@ -42,7 +42,7 @@ do if [ -f "$dir/run_test.sh" ]; then echo "running run_test" - $ROOT_DIR/$dir/run_test.sh + cd $dir && $ROOT_DIR/$dir/run_test.sh if [ $? -ne 0 ]; then echo "Error running run_test for $dir" exit 1