Mirrors/cmake-examples
1
0
Fork 0
mirror of https://github.com/ttroy50/cmake-examples.git synced 2025-12-18 12:14:36 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix travis tests

Browse Source
This commit is contained in:
ttroy50
2016-02-14 11:48:12 +00:00
parent 6682980521
commit 34f9797448
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
01-basic/I-compiling-with-clang/run_test.sh
View File

@@ -2,7 +2,7 @@
# Ubuntu supports multiple versions of clang to be installed at the same time. # Ubuntu supports multiple versions of clang to be installed at the same time.
# The tests need to determin the clang binary before calling cmake # The tests need to determin the clang binary before calling cmake
clang_bin=`which clang` clang_bin=`which clang`
clang_xx_bin="clang++" clang_xx_bin="which clang++"
if [ -z $clang_bin ]; then if [ -z $clang_bin ]; then
clang_ver=`dpkg --get-selections | grep clang | grep -v -m1 libclang | cut -f1 | cut -d '-' -f2` clang_ver=`dpkg --get-selections | grep clang | grep -v -m1 libclang | cut -f1 | cut -d '-' -f2`

2
test.sh
View File

@@ -42,7 +42,7 @@ do
if [ -f "$dir/run_test.sh" ]; then if [ -f "$dir/run_test.sh" ]; then
echo "running run_test" echo "running run_test"
$ROOT_DIR/$dir/run_test.sh cd $dir && $ROOT_DIR/$dir/run_test.sh
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "Error running run_test for $dir" echo "Error running run_test for $dir"
exit 1 exit 1