projects
/
libcds.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
5109d49
)
Fix build script
author
khizmax
<khizmax@gmail.com>
Thu, 5 Mar 2015 11:21:25 +0000
(14:21 +0300)
committer
khizmax
<khizmax@gmail.com>
Thu, 5 Mar 2015 11:21:25 +0000
(14:21 +0300)
.travis.yml
patch
|
blob
|
history
build/build.sh
patch
|
blob
|
history
diff --git
a/.travis.yml
b/.travis.yml
index 1e72fb3afde9edcb8cfef358d9cb27bd791bf370..76345bb2af61a6d483ad7abfa9b5c3aebabec901 100644
(file)
--- a/
.travis.yml
+++ b/
.travis.yml
@@
-14,7
+14,7
@@
install:
\r
before_script: cd ./build
\r
\r
\r
before_script: cd ./build
\r
\r
-script: ./build.sh -b 64 -j 4 -x ${CXX} -z '-
std=c++0x -
Wall -Wextra -pedantic' -t test_hdr
\r
+script: ./build.sh -b 64 -j 4 -x ${CXX} -z '-Wall -Wextra -pedantic' -t test_hdr
\r
\r
#after_success:
\r
\r
\r
#after_success:
\r
\r
diff --git
a/build/build.sh
b/build/build.sh
index 621ffd5e1a22211951d03f26b1147458dab8aec5..95ef503e5b8f28ddd48605b0bcc285c4db9918b3 100755
(executable)
--- a/
build/build.sh
+++ b/
build/build.sh
@@
-536,7
+536,7
@@
$MAKE -f Makefile \
OBJ_PATH=$OBJ_PATH/debug \
debug
OBJ_PATH=$OBJ_PATH/debug \
debug
-if
test $? -gt 0
; then
+if
[ $? -ne 0 ]
; then
exit $?
fi
exit $?
fi
@@
-562,7
+562,7
@@
$MAKE -f Makefile \
OBJ_PATH=$OBJ_PATH/release \
release
OBJ_PATH=$OBJ_PATH/release \
release
-if
test $? -gt 0
; then
+if
[ $? -ne 0 ]
; then
exit $?
fi
exit $?
fi
@@
-584,7
+584,7
@@
if test $MAKE_DEBUG_TEST = '0'; then
OBJ_PATH=$OBJ_PATH/test \
$target
OBJ_PATH=$OBJ_PATH/test \
$target
- if
test $? -gt 0
; then
+ if
[ $? -ne 0 ]
; then
exit $?
fi
fi
exit $?
fi
fi
@@
-606,7
+606,7
@@
if test $MAKE_DEBUG_TEST = '1'; then
OBJ_PATH=$OBJ_PATH/test-debug \
$target
OBJ_PATH=$OBJ_PATH/test-debug \
$target
- if
test $? -gt 0
; then
+ if
[ $? -ne 0 ]
; then
exit $?
fi
fi
exit $?
fi
fi