Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

test: add macosx into jobs #150

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions .github/workflows/test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,14 +8,22 @@ on:

jobs:
test:
runs-on: ubuntu-latest
name: CPP
strategy:
fail-fast: false
matrix:
os: [ubuntu-latest, macosx-latest]
runs-on: ${{ matrix.os }}
env:
CPLUS_INCLUDE_PATH: "/usr/local/include/:/usr/include/jsoncpp/:/usr/local/opt/openssl/include/:/usr/lib/"
steps:
- uses: actions/checkout@v3
- run: sudo apt-get install lcov libcurl4-openssl-dev libssl-dev uuid-dev libjson-c-dev libjsoncpp-dev nodejs npm

- if: ${{ matrix.os == 'ubuntu-latest' }}
run: sudo apt-get install lcov libcurl4-openssl-dev libssl-dev uuid-dev libjson-c-dev libjsoncpp-dev nodejs npm
- if: ${{ matrix.os == 'macosx-latest' }}
run: brew install lcov libcurl4-openssl-dev libssl-dev uuid-dev libjson-c-dev libjsoncpp-dev nodejs npm

- run: bash ./unit_test.sh
- run: bash ./generate_code_cov.sh
- run: bash ./generate_code_cov.sh
- run: bash ./function_test.sh
- run: bash <(curl -s https://codecov.io/bash)
4 changes: 2 additions & 2 deletions easyinstall.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,11 @@ if command -v python > /dev/null ; then
MAKE="make -j $(python -c 'import multiprocessing as mp; print(int(mp.cpu_count()))')"
fi

echo $MAKE
echo "$MAKE"

rm -rf sdk_build
mkdir sdk_build
cd sdk_build
cd sdk_build || exit
cmake -DBUILD_PRODUCT="$product" -DBUILD_FUNCTION_TESTS=OFF -DBUILD_UNIT_TESTS=OFF -DENABLE_COVERAGE=OFF -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr ..
$MAKE

Expand Down
6 changes: 3 additions & 3 deletions function_test.sh
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
#!/bin/bash

cd `dirname $0`
cd $(dirname "$0") || exit
echo '-------build function test----------'

MAKE=make
if command -v python > /dev/null ; then
MAKE="make -j $(python -c 'import multiprocessing as mp; print(int(mp.cpu_count()))')"
fi

echo $MAKE
echo "$MAKE"

FT_BUILD_DIR=ft_build
rm -rf $FT_BUILD_DIR
mkdir $FT_BUILD_DIR
cd $FT_BUILD_DIR
cd $FT_BUILD_DIR || exit
cmake -DBUILD_FUNCTION_TESTS=ON -DBUILD_UNIT_TESTS=OFF ..
$MAKE cdn core cs ecs rds slb vpc cdn_ft core_ft cs_ft ecs_ft nlp_ft rds_ft slb_ft vpc_ft

Expand Down
22 changes: 11 additions & 11 deletions unit_test.sh
Original file line number Diff line number Diff line change
@@ -1,44 +1,44 @@
#!/bin/bash

cd `dirname $0`
cd $(dirname "$0") || exit
echo '-------build unit test----------'

echo 'start a test http server'
NODE=`which nodejs`
NODE=$(which nodejs)

if [ "$NODE" ]
then
echo ''
else
NODE=`which node`
NODE=$(which node)
fi

echo 'node binary path: ' $NODE
echo 'node binary path: ' "$NODE"

server=`ps -ef | grep http_test_server | grep -v grep`
echo "check server: " $server
server=$(ps -ef | grep http_test_server | grep -v grep)
echo "check server: " "$server"
if [ "$server" ]
then
echo "server is on"
else
echo "server is off, start it"
cd test/httpserver
cd test/httpserver || exit
npm i
nohup $NODE http_test_server.js &
cd -
nohup "$NODE" http_test_server.js &
cd - || exit
fi

MAKE=make
if command -v python > /dev/null ; then
MAKE="make -j $(python -c 'import multiprocessing as mp; print(int(mp.cpu_count()))')"
fi

echo $MAKE
echo "$MAKE"

UT_BUILD_DIR=ut_build
rm -rf $UT_BUILD_DIR
mkdir $UT_BUILD_DIR
cd $UT_BUILD_DIR
cd $UT_BUILD_DIR || exit
cmake -DBUILD_FUNCTION_TESTS=OFF -DBUILD_UNIT_TESTS=ON -DENABLE_COVERAGE=ON ..
$MAKE core_ut

Expand Down