mirror of
https://dev.iopsys.eu/bbf/bbfdm.git
synced 2025-12-10 07:44:39 +01:00
Gitlab-ci: update docker image and improve the code
This commit is contained in:
Amin Ben Ramdhane
parent
1c9316e665
commit
7c3f42564c
8 changed files with 46 additions and 109 deletions
|
|
@ -15,7 +15,7 @@ variables:
|
|||
|
||||
run_unit_test:
|
||||
stage: unit_test
|
||||
image: iopsys/code-analysis-dev:latest
|
||||
image: iopsys/code-analysis:latest
|
||||
allow_failure: false
|
||||
script:
|
||||
- "./gitlab-ci/setup.sh"
|
||||
|
|
@ -28,7 +28,7 @@ run_unit_test:
|
|||
|
||||
run_functional_test:
|
||||
stage: functional_test
|
||||
image: iopsys/code-analysis-dev:latest
|
||||
image: iopsys/code-analysis:latest
|
||||
allow_failure: false
|
||||
script:
|
||||
- "./gitlab-ci/setup.sh"
|
||||
|
|
@ -42,7 +42,7 @@ run_functional_test:
|
|||
|
||||
run_functional_api_test:
|
||||
stage: functional_api_test
|
||||
image: iopsys/code-analysis-dev:latest
|
||||
image: iopsys/code-analysis:latest
|
||||
allow_failure: false
|
||||
script:
|
||||
- "./gitlab-ci/setup.sh"
|
||||
|
|
|
|||
|
|
@ -167,11 +167,3 @@ libbbfdm_la_CFLAGS+=-I../dmtree
|
|||
libbbfdm_la_CFLAGS+=-I../dmtree/tr181
|
||||
libbbfdm_la_CFLAGS+=-I../dmtree/tr104
|
||||
libbbfdm_la_CFLAGS+=-I../dmtree/tr143
|
||||
|
||||
if BBF_TEST
|
||||
libbbf_api_la_CFLAGS += -fprofile-arcs -ftest-coverage
|
||||
libbbf_api_la_LDFLAGS += --coverage
|
||||
|
||||
libbbfdm_la_CFLAGS += -fprofile-arcs -ftest-coverage
|
||||
libbbfdm_la_LDFLAGS += --coverage
|
||||
endif
|
||||
|
|
|
|||
|
|
@ -18,9 +18,6 @@ AM_CONDITIONAL([LOPENSSL],[test "x$enable_libopenssl" = "xyes"])
|
|||
AC_ARG_ENABLE(libmbedtls, [AS_HELP_STRING([--enable-libmbedtls], [enable libmbedtls upnp feature])], AC_DEFINE(LMBEDTLS),)
|
||||
AM_CONDITIONAL([LMBEDTLS],[test "x$enable_libmbedtls" = "xyes"])
|
||||
|
||||
AC_ARG_ENABLE(bbf_test, [AS_HELP_STRING([--enable-bbf-test], [enable bbf unit test])], AC_DEFINE(BBF_TEST),)
|
||||
AM_CONDITIONAL([BBF_TEST],[test "x$enable_bbf_test" = "xyes"])
|
||||
|
||||
AC_ARG_ENABLE(vendor_extension, [AS_HELP_STRING([--enable-vendor-extension], [enable vendor extension])], AC_DEFINE(BBF_VENDOR_EXTENSION),)
|
||||
AM_CONDITIONAL([BBF_VENDOR_EXTENSION],[test "x$enable_vendor_extension" = "xyes"])
|
||||
|
||||
|
|
|
|||
|
|
@ -5,38 +5,13 @@ pwd
|
|||
source ./gitlab-ci/shared.sh
|
||||
|
||||
# compile and install libbbf
|
||||
echo "Compiling libbbf"
|
||||
if [ -f Makefile ]; then
|
||||
exec_cmd make maintainer-clean
|
||||
find -name '*.gcno' -exec rm {} -fv \;
|
||||
find -name '*.gcov' -exec rm {} -fv \;
|
||||
find -name '*.deps' -exec rm {} -rfv \;
|
||||
rm -f *.log *.xml
|
||||
fi
|
||||
|
||||
exec_cmd autoreconf -i
|
||||
exec_cmd ./configure --enable-tr181 --enable-tr104 --enable-tr143 --enable-bbf-test --enable-vendor-extension BBF_VENDOR_LIST="iopsys"
|
||||
exec_cmd make CPPFLAGS=-DBBF_VENDOR_LIST=\\\"iopsys\\\" CPPFLAGS+=-DBBF_VENDOR_PREFIX=\\\"X_IOPSYS_EU_\\\"
|
||||
|
||||
echo "installing libbbf"
|
||||
exec_cmd make install
|
||||
ldconfig
|
||||
|
||||
echo "configuring libbbf"
|
||||
mkdir -p /etc/bbfdm/
|
||||
mkdir -p /etc/bbfdm/dmmap
|
||||
mkdir -p /etc/bbfdm/json
|
||||
mkdir -p /usr/share/bbfdm
|
||||
mkdir -p /usr/lib/bbfdm
|
||||
cp -f scripts/* /usr/share/bbfdm
|
||||
|
||||
install_libbbf
|
||||
|
||||
supervisorctl status all
|
||||
supervisorctl update
|
||||
sleep 3
|
||||
supervisorctl status all
|
||||
|
||||
|
||||
echo "Running the functional API test cases"
|
||||
make clean -C test/cmocka/
|
||||
make functional-api-test -C test/cmocka/
|
||||
|
|
|
|||
|
|
@ -8,46 +8,13 @@ source ./gitlab-ci/shared.sh
|
|||
ln -sf bash /bin/sh
|
||||
|
||||
# compile and install libbbf
|
||||
echo "Compiling libbbf"
|
||||
if [ -f Makefile ]; then
|
||||
exec_cmd make maintainer-clean
|
||||
find -name '*.gcno' -exec rm {} -fv \;
|
||||
find -name '*.gcov' -exec rm {} -fv \;
|
||||
find -name '*.deps' -exec rm {} -rfv \;
|
||||
rm -f *.log *.xml
|
||||
fi
|
||||
|
||||
exec_cmd autoreconf -i
|
||||
exec_cmd ./configure --enable-tr181 --enable-tr104 --enable-tr143 --enable-bbf-test --enable-vendor-extension BBF_VENDOR_LIST="iopsys"
|
||||
exec_cmd make CPPFLAGS=-DBBF_VENDOR_LIST=\\\"iopsys\\\" CPPFLAGS+=-DBBF_VENDOR_PREFIX=\\\"X_IOPSYS_EU_\\\"
|
||||
|
||||
echo "installing libbbf"
|
||||
exec_cmd make install
|
||||
ldconfig
|
||||
|
||||
echo "configuring libbbf"
|
||||
mkdir -p /etc/bbfdm/
|
||||
mkdir -p /etc/bbfdm/dmmap
|
||||
mkdir -p /etc/bbfdm/json
|
||||
mkdir -p /usr/share/bbfdm
|
||||
mkdir -p /usr/lib/bbfdm
|
||||
cp -f scripts/* /usr/share/bbfdm
|
||||
|
||||
# compile and install libbbf_test
|
||||
echo "Compiling libbbf_test"
|
||||
make clean -C test/bbf_test/
|
||||
make -C test/bbf_test/
|
||||
|
||||
echo "installing libbbf_test"
|
||||
cp -f test/bbf_test/libbbf_test.so /usr/lib/bbfdm
|
||||
|
||||
install_libbbf
|
||||
|
||||
supervisorctl status all
|
||||
supervisorctl update
|
||||
sleep 3
|
||||
supervisorctl status all
|
||||
|
||||
|
||||
echo "Running the functional test cases"
|
||||
make clean -C test/cmocka/
|
||||
make functional-test -C test/cmocka/
|
||||
|
|
|
|||
|
|
@ -21,3 +21,42 @@ function exec_cmd()
|
|||
fi
|
||||
}
|
||||
|
||||
function install_libbbf()
|
||||
{
|
||||
COV_CFLAGS='-fprofile-arcs -ftest-coverage'
|
||||
COV_LDFLAGS='--coverage'
|
||||
VENDOR_LIST='iopsys,test'
|
||||
|
||||
echo "Compiling libbbf"
|
||||
if [ -f Makefile ]; then
|
||||
exec_cmd make maintainer-clean
|
||||
find -name '*.gcno' -exec rm {} -fv \;
|
||||
find -name '*.gcov' -exec rm {} -fv \;
|
||||
find -name '*.deps' -exec rm {} -rfv \;
|
||||
rm -f *.log *.xml
|
||||
fi
|
||||
|
||||
autoreconf -i >/dev/null 2>&1
|
||||
./configure CFLAGS="$COV_CFLAGS" LDFLAGS="$COV_LDFLAGS" BBF_VENDOR_LIST="$VENDOR_LIST" --enable-tr181 --enable-tr104 --enable-tr143 --enable-libopenssl --enable-vendor-extension >/dev/null 2>&1
|
||||
exec_cmd make CPPFLAGS=-DBBF_VENDOR_LIST=\\\"iopsys\\\" CPPFLAGS+=-DBBF_VENDOR_PREFIX=\\\"X_IOPSYS_EU_\\\"
|
||||
|
||||
echo "installing libbbf"
|
||||
exec_cmd make install
|
||||
ldconfig
|
||||
|
||||
echo "configuring libbbf"
|
||||
mkdir -p /etc/bbfdm/
|
||||
mkdir -p /etc/bbfdm/dmmap
|
||||
mkdir -p /etc/bbfdm/json
|
||||
mkdir -p /usr/share/bbfdm
|
||||
mkdir -p /usr/lib/bbfdm
|
||||
cp -f scripts/* /usr/share/bbfdm
|
||||
|
||||
# compile and install libbbf_test
|
||||
echo "Compiling libbbf_test"
|
||||
make clean -C test/bbf_test/
|
||||
make -C test/bbf_test/
|
||||
|
||||
echo "installing libbbf_test"
|
||||
cp -f test/bbf_test/libbbf_test.so /usr/lib/bbfdm
|
||||
}
|
||||
|
|
|
|||
|
|
@ -8,46 +8,13 @@ source ./gitlab-ci/shared.sh
|
|||
ln -sf bash /bin/sh
|
||||
|
||||
# compile and install libbbf
|
||||
echo "Compiling libbbf"
|
||||
if [ -f Makefile ]; then
|
||||
exec_cmd make maintainer-clean
|
||||
find -name '*.gcno' -exec rm {} -fv \;
|
||||
find -name '*.gcov' -exec rm {} -fv \;
|
||||
find -name '*.deps' -exec rm {} -rfv \;
|
||||
rm -f *.log *.xml
|
||||
fi
|
||||
|
||||
exec_cmd autoreconf -i
|
||||
exec_cmd ./configure --enable-tr181 --enable-tr104 --enable-tr143 --enable-bbf-test --enable-vendor-extension BBF_VENDOR_LIST="iopsys"
|
||||
exec_cmd make CPPFLAGS=-DBBF_VENDOR_LIST=\\\"iopsys\\\" CPPFLAGS+=-DBBF_VENDOR_PREFIX=\\\"X_IOPSYS_EU_\\\"
|
||||
|
||||
echo "installing libbbf"
|
||||
exec_cmd make install
|
||||
ldconfig
|
||||
|
||||
echo "configuring libbbf"
|
||||
mkdir -p /etc/bbfdm/
|
||||
mkdir -p /etc/bbfdm/dmmap
|
||||
mkdir -p /etc/bbfdm/json
|
||||
mkdir -p /usr/share/bbfdm
|
||||
mkdir -p /usr/lib/bbfdm
|
||||
cp -f scripts/* /usr/share/bbfdm
|
||||
|
||||
# compile and install libbbf_test
|
||||
echo "Compiling libbbf_test"
|
||||
make clean -C test/bbf_test/
|
||||
make -C test/bbf_test/
|
||||
|
||||
echo "installing libbbf_test"
|
||||
cp -f test/bbf_test/libbbf_test.so /usr/lib/bbfdm
|
||||
|
||||
install_libbbf
|
||||
|
||||
supervisorctl status all
|
||||
supervisorctl update
|
||||
sleep 3
|
||||
supervisorctl status all
|
||||
|
||||
|
||||
echo "Running the unit test cases"
|
||||
make clean -C test/cmocka/
|
||||
make unit-test -C test/cmocka/
|
||||
|
|
|
|||
|
|
@ -6,7 +6,7 @@ UNIT_TESTS = unit_test_bbfd
|
|||
FUNCTIONAL_TESTS = functional_test_bbfd
|
||||
FUNCTIONAL_API_TESTS = functional_api_test_bbfd
|
||||
|
||||
VALGRIND = valgrind --show-reachable=yes \
|
||||
VALGRIND = valgrind --leak-check=full --show-reachable=no \
|
||||
--show-leak-kinds=all --errors-for-leak-kinds=all \
|
||||
--error-exitcode=1 --track-origins=yes
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue