THRIFT-2534 Cross language test results should recorded to a status.md or status.html file automatically
also removes go and lua from travis CI builds
diff --git a/.travis.yml b/.travis.yml
index 6a0593e..2ae6fcb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -62,15 +62,13 @@
# node.js
- sudo apt-get install -qq nodejs npm
- sudo npm install nodeunit -g || true
-# TODO: move npm install to nodejs Makefile
- - cd lib/nodejs; npm install & cd ../..
install:
- sh bootstrap.sh
script:
# TODO: fix these languages
- - sh configure --without-erlang --without-haskell --without-python
+ - sh configure --without-erlang --without-haskell --without-python --without-go --without-lua
- make -j$NUM_CPU && make dist
- make cross -j$NUM_CPU
- sh bootstrap.sh ; sh contrib/mingw-cross-compile.sh
diff --git a/test/test.sh b/test/test.sh
index 6086ab8..9bb60cf 100755
--- a/test/test.sh
+++ b/test/test.sh
@@ -141,10 +141,9 @@
echo "" >> log/error.log
fi
- # write json array
- client_server=( ${client_server//[-]/ } )
- server=${client_server[0]}
- client=${client_server[1]}
+ # split client-server string
+ client=${client_server%-*}
+ server=${client_server#*-}
cat << EOF >> $STATUS_HTML
[
@@ -385,8 +384,8 @@
echo " full log is here test/log/client_server_protocol_transport_server.log"
echo " or look at file://$BASEDIR/$STATUS_HTML"
-ELAPSED_TIME=$(($SECONDS - $START_TIME))
-DURATION="$(($ELAPSED_TIME/60)) min $(($ELAPSED_TIME%60)) sec"
+ELAPSED_TIME=$(echo "(${SECONDS} - ${START_TIME})" | bc)
+DURATION="${ELAPSED_TIME} seconds"
echo "test an took" $DURATION
print_html_footer "$DURATION"