mirror/bbfdm
1
0
Fork 0
mirror of https://dev.iopsys.eu/bbf/bbfdm.git synced 2026-01-28 01:47:18 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Removed libbbf_api.so and disabled libbbf_ubus

Browse source
This commit is contained in:
vdutta 2022-04-28 18:29:37 +05:30 • committed by Vivek Kumar Dutta
parent 4dbe4719ec
commit ec38598048
7 changed files with 9 additions and 58 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
.gitlab-ci.yml
View file

@ -56,23 +56,6 @@ run_functional_api_test:
- timestamp.log
- functional-api-test-coverage.xml
run_libbbf_ubus_test:
stage: functional_test
image: iopsys/code-analysis:latest
allow_failure: false
script:
- "./gitlab-ci/setup.sh"
- "./gitlab-ci/libbbf_ubus_api_test.sh"
artifacts:
when: always
reports:
junit: ./report/tap.xml
paths:
- timestamp.log
- memory-report.xml
- api-result.log
run_tools_test:
stage: unit_test
image: iopsys/code-analysis:latest

2
Makefile.am
View file

@ -9,4 +9,4 @@ libbbfdm_include_HEADERS = *.h
libbbf_api_include_HEADERS = libbbf_api/*.h
libbbf_ubus_include_HEADERS = include/*.h
SUBDIRS = bin libbbf_ubus
SUBDIRS = bin

33
bin/Makefile.am
View file

@ -1,35 +1,4 @@
lib_LTLIBRARIES = libbbf_api.la
libbbf_api_la_SOURCES = \
../libbbf_api/dmbbf.c \
../libbbf_api/dmubus.c \
../libbbf_api/dmjson.c \
../libbbf_api/dmuci.c \
../libbbf_api/dmcommon.c \
../libbbf_api/dmmem.c \
../libbbf_api/dmapi.c
libbbf_api_la_CFLAGS = \
$(AM_CFLAGS) \
$(LIBUCI_CFLAGS) \
$(LIBUBOX_CFLAGS) \
$(LIBUBUS_CFLAGS)
libbbf_api_la_LDFLAGS = \
$(AM_LDFLAGS) \
$(LIBUCI_LDFLAGS) \
$(LIBUBOX_LDFLAGS) \
$(LIBUBUS_LDFLAGS)
libbbf_api_la_LIBADD = \
$(AM_LIBS) \
$(LIBUCI_LIBS) \
$(LIBUBOX_LIBS) \
$(LIBUBUS_LIBS) \
$(LIBJSON_LIBS) \
$(LBLOBMSG_LIBS)
lib_LTLIBRARIES += libbbfdm.la
lib_LTLIBRARIES = libbbfdm.la
libbbfdm_la_SOURCES = \
../dmentry.c \

2
configure.ac
View file

@ -3,7 +3,7 @@ AC_CONFIG_MACRO_DIR([m4])
AM_INIT_AUTOMAKE([foreign subdir-objects])
AC_CONFIG_SUBDIRS([libbbf_ubus])
#AC_CONFIG_SUBDIRS([libbbf_ubus])
AC_ARG_ENABLE(tr181, [AS_HELP_STRING([--enable-tr181], [enable tr181 device feature])], AC_DEFINE(BBF_TR181),)
AM_CONDITIONAL([BBF_TR181],[test "x$enable_tr181" = "xyes"])

6
gitlab-ci/shared.sh
View file

@ -105,9 +105,9 @@ function install_libbbf_test()
ldconfig
# compile and install libbbf_ubus_test
echo "Compiling libbbf_ubus_test"
make clean -C test/dynamicdm_ubus_test/
make -C test/dynamicdm_ubus_test/
#echo "Compiling libbbf_ubus_test"
#make clean -C test/dynamicdm_ubus_test/
#make -C test/dynamicdm_ubus_test/
}
function install_libbulkdata()

2
test/bbf_test/Makefile
View file

@ -4,7 +4,7 @@ BIN = bbf_dm
BIN_OBJ = bbf_dm.o
LIB_OBJS = libbbf_test.o
LIB_CFLAGS = $(CFLAGS) -Wall -Werror -fPIC -I /usr/local/include/
LIB_LDFLAGS = $(LDFLAGS) -lbbf_api -lubus
LIB_LDFLAGS = $(LDFLAGS) -lubus
BIN_LDFLAGS = $(LDFLAGS) -lbbfdm -lubus
%.o: %.c

5
test/cmocka/Makefile
View file

@ -1,7 +1,6 @@
CC = gcc
CFLAGS = -g -Wall -Werror
LDFLAGS = -lcmocka -lbbfdm -lbbf_api -lubus
LDFLAGS_API_TEST = -lcmocka -lbbf_api -lubus
LDFLAGS = -lcmocka -lbbfdm -lubus
UNIT_TESTS = unit_test_bbfd
FUNCTIONAL_TESTS = functional_test_bbfd
FUNCTIONAL_API_TESTS = functional_api_test_bbfd
@ -17,7 +16,7 @@ functional_test_bbfd: functional_test_bbfd.o
$(CC) -o $@ $^ $(LDFLAGS)
functional_api_test_bbfd: functional_api_test_bbfd.o
$(CC) -o $@ $^ $(LDFLAGS_API_TEST)
$(CC) -o $@ $^ $(LDFLAGS)
unit-test: $(UNIT_TESTS)
$(foreach testprog, $(UNIT_TESTS), sudo $(VALGRIND) ./$(testprog);)