Skip to content

Commit

Permalink
Replace return 1 with exit 1
Browse files Browse the repository at this point in the history
  • Loading branch information
mloskot committed Jun 27, 2013
1 parent 3eb1df8 commit 35192f9
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 12 deletions.
14 changes: 7 additions & 7 deletions scripts/ci/before_install.sh
@@ -1,10 +1,10 @@
#!/bin/bash
# Installs requirements for PDAL
source ./scripts/ci/common.sh
sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 16126D3A3E5C1192 || return 1
sudo apt-get install python-software-properties -y || return 1
sudo add-apt-repository ppa:ubuntugis/ppa -y || return 1
sudo apt-get update -qq || return 1
sudo apt-get install cmake libgdal-dev libgeotiff-dev libproj-dev libxml2-dev || return 1
gcc --version || return 1
clang --version || return 1
sudo apt-key adv --recv-keys --keyserver keyserver.ubuntu.com 16126D3A3E5C1192 || exit 1
sudo apt-get install python-software-properties -y || exit 1
sudo add-apt-repository ppa:ubuntugis/ppa -y || exit 1
sudo apt-get update -qq || exit 1
sudo apt-get install cmake libgdal-dev libgeotiff-dev libproj-dev libxml2-dev || exit 1
gcc --version || exit 1
clang --version || exit 1
10 changes: 5 additions & 5 deletions scripts/ci/script.sh
@@ -1,16 +1,16 @@
#!/bin/bash
# Builds and tests PDAL
source ./scripts/ci/common.sh
mkdir -p _build || return 1
cd _build || return 1
mkdir -p _build || exit 1
cd _build || exit 1

cmake \
-DWITH_GDAL=ON \
-DWITH_GEOTIFF=ON \
-DWITH_LIBXML2=ON \
.. \
|| return 1
|| exit 1

make -j ${NUMTHREADS} || return 1
make -j ${NUMTHREADS} || exit 1

ctest -V --output-on-failure . || return 1
ctest -V --output-on-failure . || exit 1

0 comments on commit 35192f9

Please sign in to comment.