From 02c4741d644da590dd3217d84a06ca85e0f6247f Mon Sep 17 00:00:00 2001 From: winlin Date: Wed, 27 May 2015 07:30:37 +0800 Subject: [PATCH] add usage and make jobs support for configure test script --- trunk/scripts/srs.test | 8 +++- trunk/scripts/test_configure.sh | 85 +++++++++++++++++---------------- 2 files changed, 51 insertions(+), 42 deletions(-) diff --git a/trunk/scripts/srs.test b/trunk/scripts/srs.test index eda09c6cf..da122ebf8 100755 --- a/trunk/scripts/srs.test +++ b/trunk/scripts/srs.test @@ -1,5 +1,11 @@ #!/bin/bash -bash scripts/test_configure.sh && ./objs/srs_utest +echo "Usage: $0 [-jN]" +echo " -jN The make jobs, for example, -j8 to use 8cpu to make" + +params="$@" +echo "params is: $params" + +bash scripts/test_configure.sh $params && ./objs/srs_utest ret=$?; if [[ 0 -ne $ret ]]; then echo "configure test and utest failed."; exit $ret; fi echo "configure test and utest success"; diff --git a/trunk/scripts/test_configure.sh b/trunk/scripts/test_configure.sh index c28423b16..6e80ef5b7 100755 --- a/trunk/scripts/test_configure.sh +++ b/trunk/scripts/test_configure.sh @@ -1,5 +1,8 @@ #!/bin/bash +params="$@" +echo "params is: $params" + # discover the current work dir, the log and access. echo "argv[0]=$0" if [[ ! -f $0 ]]; then @@ -19,181 +22,181 @@ ret=$?; if [[ $ret -ne 0 ]]; then exit $ret; fi item="./configure" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --x86-x64" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --disable-all" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --pure-rtmp" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --rtmp-hls" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-ssl" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-hls" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-dvr" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-nginx" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-http-callback" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-http-server" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-http-api" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-ffmpeg" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-transcode" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-ingest" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-librtmp" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-research" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast--with-stream-caster" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-utest" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-ssl --with-utest" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-gperf" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-gperf --with-gmc" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-gperf --with-gmp" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-gperf --with-gcp" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --with-gprof" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --log-verbose" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --log-info" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --log-trace" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast --log-info --log-verbose --log-trace" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" @@ -202,25 +205,25 @@ ok_msg "test \" ${item} \" success" ####################################################################################################### item="./configure --dev" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --fast-dev" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --demo" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --full" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" @@ -229,43 +232,43 @@ ok_msg "test \" ${item} \" success" ####################################################################################################### item="./configure --disable-all --with-ssl" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --disable-all --with-hls --with-ssl --with-http-server --with-http-api" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --disable-all --with-ssl --with-hls --with-nginx" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --disable-all --with-ssl --with-hls --with-nginx --with-ffmpeg --with-transcode" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --disable-all --with-ssl --with-ffmpeg --with-transcode" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --disable-all --with-ssl --with-ffmpeg --with-ingest" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success" item="./configure --disable-all --with-hls --with-ssl --with-http-server" ok_msg "test \" ${item} \"" -($item && make) >>$log 2>&1 +($item && make $params) >>$log 2>&1 ret=$?; if [[ $ret -ne 0 ]]; then failed_msg "test \" ${item} \" failed. ret=$ret"; exit $ret; fi ok_msg "test \" ${item} \" success"