revert some travis shell portability tweaks

This commit is contained in:
Brent Cook 2015-09-09 07:13:05 -05:00
parent 9e090286b5
commit 46c9a8de8b

View File

@ -3,10 +3,10 @@ set -e
./autogen.sh ./autogen.sh
if "x$ARCH" = "xnative"; then if [ "x$ARCH" = "xnative" ]; then
# test autotools # test autotools
./configure ./configure
if `uname` = "Darwin"; then if [ `uname` = "Darwin" ]; then
# OS X runs out of resources if we run 'make -j check' # OS X runs out of resources if we run 'make -j check'
make check make check
else else
@ -21,7 +21,7 @@ if "x$ARCH" = "xnative"; then
cd build cd build
# test cmake and ninja # test cmake and ninja
if `uname` = "Darwin"; then if [ `uname` = "Darwin" ]; then
cmake .. cmake ..
make make
else else
@ -33,7 +33,7 @@ if "x$ARCH" = "xnative"; then
fi fi
else else
CPU=i686 CPU=i686
if "x$ARCH" = "xmingw64"; then if [ "x$ARCH" = "xmingw64" ]; then
CPU=x86_64 CPU=x86_64
fi fi
export CC=$CPU-w64-mingw32-gcc export CC=$CPU-w64-mingw32-gcc