1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-12 19:31:53 +00:00

Build: Change make utest for test

This commit is contained in:
winlin 2021-12-02 20:15:28 +08:00
parent 4d10a453f6
commit bc063945f1
6 changed files with 5 additions and 50 deletions

View file

@ -63,7 +63,7 @@ jobs:
run: docker build --tag srs:test -f trunk/Dockerfile.test .
# For utest
- name: Run SRS utest
run: docker run --rm srs:test bash -c 'make && ./objs/srs_utest'
run: docker run --rm srs:test bash -c 'make utest && ./objs/srs_utest'
# For regression-test
- name: Run SRS regression-test
run: docker run --rm srs:test bash -c 'make && ./objs/srs -c conf/regression-test.conf && cd 3rdparty/srs-bench && make && ./objs/srs_test -test.v'

View file

@ -93,7 +93,7 @@ jobs:
run: docker build --tag srs:test -f trunk/Dockerfile.test .
# For utest
- name: Run SRS utest
run: docker run --rm srs:test bash -c 'make && ./objs/srs_utest'
run: docker run --rm srs:test bash -c 'make utest && ./objs/srs_utest'
# For regression-test
- name: Run SRS regression-test
run: docker run --rm srs:test bash -c 'make && ./objs/srs -c conf/regression-test.conf && cd 3rdparty/srs-bench && make && ./objs/srs_test -test.v'
@ -124,7 +124,7 @@ jobs:
SRS_PR=$(echo ${{ github.ref }}| awk -F 'refs/pull/' '{print $2}'| awk -F '/' '{print $1}')
echo "For ref=${{ github.ref }}, sha=${{ github.sha }}, SRS_BRANCH=$SRS_BRANCH, SRS_PR=$SRS_PR, SRS_SHA=$SRS_SHA, SRS_PROJECT=$SRS_PROJECT"
docker run --rm --env SRS_BRANCH=$SRS_BRANCH --env SRS_PR=$SRS_PR --env SRS_SHA=$SRS_SHA --env SRS_PROJECT=$SRS_PROJECT \
srs:cov bash -c 'make && ./objs/srs_utest && bash auto/codecov.sh'
srs:cov bash -c 'make utest && ./objs/srs_utest && bash auto/codecov.sh'
done:
name: actions-test-done

View file

@ -6,7 +6,7 @@ RUN yum install -y gcc make gcc-c++ patch unzip perl git
# Build and install SRS.
COPY . /srs
WORKDIR /srs/trunk
RUN ./configure --srt=on --utest=on --jobs=2 && make -j2
RUN ./configure --srt=on --utest=on --jobs=2 && make -j2 utest
RUN cd 3rdparty/srs-bench && make
# Run utest

View file

@ -1,7 +1,7 @@
#!/bin/bash
# In .circleci/config.yml, generate *.gcno with
# ./configure --gcov --without-research --without-librtmp && make
# ./configure --gcov --without-research --without-librtmp && make utest
# and generate *.gcda by
# ./objs/srs_utest

View file

@ -1,33 +0,0 @@
#!/bin/bash
MODULES=""
if [[ $# -gt 0 ]]; then
for module in $@; do
module=$(basename $module)
if [[ $module == "src" ]]; then
MODULES="objs/src"
break
fi
MODULES="$MODULES objs/src/$module"
done
fi
if [[ $MODULES == "" ]]; then
MODULES="objs/src"
fi
IS_LINUX=yes
uname -s|grep Darwin >/dev/null && IS_DARWIN=yes && IS_LINUX=no
echo "IS_LINUX: $IS_LINUX, IS_DARWIN: $IS_DARWIN"
echo "Clean gcda files"
find objs -name *.gcda |xargs rm -f
echo "Build and run utest"
make -j10 && ./objs/srs_utest
echo "Generating coverage at $MODULES"
mkdir -p ./objs/coverage &&
gcovr -r src --html --html-details -o ./objs/coverage/srs.html $MODULES &&
echo "Coverage report at ./objs/coverage/srs.html" &&
open ./objs/coverage/srs.html

View file

@ -1,12 +0,0 @@
#!/bin/bash
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";