From 7857895fbd23e00004f0602b21674104a861d8a8 Mon Sep 17 00:00:00 2001 From: Masatoshi Fukunaga Date: Wed, 1 Feb 2023 11:56:25 +0900 Subject: [PATCH] Change build settings to get coverage --- .github/workflows/test.yml | 32 +++++++++++----------- Makefile | 28 ++++++++++++++++++++ README.md | 1 + rockspecs/libtls-3.4.1-3.rockspec | 44 ++++++++++--------------------- rockspecs/libtls-scm-1.rockspec | 44 ++++++++++--------------------- 5 files changed, 73 insertions(+), 76 deletions(-) create mode 100644 Makefile diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index af1e394..c8fd2b1 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -31,11 +31,11 @@ jobs: matrix: lua-version: - "5.1" - - "5.2" - - "5.3" - - "5.4" - - "luajit-2.0.5" - - "luajit-openresty" + # - "5.2" + # - "5.3" + # - "5.4" + # - "luajit-2.0.5" + # - "luajit-openresty" steps: - name: Checkout @@ -44,7 +44,7 @@ jobs: submodules: 'true' - name: Setup Lua ${{ matrix.lua-version }} - uses: leafo/gh-actions-lua@v8.0.0 + uses: leafo/gh-actions-lua@v8 with: luaVersion: ${{ matrix.lua-version }} - @@ -76,13 +76,13 @@ jobs: name: Run Test run: | testcase ./test/ - # - - # name: Generate coverage reports - # run: | - # sh ./covgen.sh - # - - # name: Upload c coverage to Codecov - # uses: codecov/codecov-action@v2 - # with: - # files: ./coverage/lcov.info - # flags: unittests + - + name: Generate coverage reports + run: | + sh ./covgen.sh + - + name: Upload c coverage to Codecov + uses: codecov/codecov-action@v2 + with: + files: ./coverage/lcov.info + flags: unittests diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..dd4ab2e --- /dev/null +++ b/Makefile @@ -0,0 +1,28 @@ +TARGET=libtls.$(LIB_EXTENSION) +SRCS=$(wildcard src/*.c) +SOBJ=$(SRCS:.c=.$(LIB_EXTENSION)) +SUBMOD:=$(filter-out src/$(TARGET),$(SOBJ)) +INSTALL?=install + +ifdef LIBTLS_COVERAGE +COVFLAGS=--coverage +endif + + +.PHONY: all install + +all: $(SOBJ) + +%.o: %.c + $(CC) $(CFLAGS) $(WARNINGS) $(COVFLAGS) $(CPPFLAGS) -o $@ -c $< + +%.$(LIB_EXTENSION): %.o + $(CC) -o $@ $^ $(LDFLAGS) $(LIBS) $(PLATFORM_LDFLAGS) $(COVFLAGS) + +install: + $(INSTALL) -d $(INST_LIBDIR) + $(INSTALL) src/$(TARGET) $(INST_LIBDIR) + $(INSTALL) -d $(INST_LIBDIR)/libtls + $(INSTALL) $(SUBMOD) $(INST_LIBDIR)/libtls/ + rm -f ./src/*.o ./src/*.so ./src/*.gcda + diff --git a/README.md b/README.md index afdda5f..916a45c 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,7 @@ # lua-libtls [![test](https://github.com/mah0x211/lua-libtls/actions/workflows/test.yml/badge.svg)](https://github.com/mah0x211/lua-libtls/actions/workflows/test.yml) +[![codecov](https://codecov.io/gh/mah0x211/lua-libtls/branch/master/graph/badge.svg)](https://codecov.io/gh/mah0x211/lua-libtls) libtls bindings for lua. diff --git a/rockspecs/libtls-3.4.1-3.rockspec b/rockspecs/libtls-3.4.1-3.rockspec index 84ec62c..64f57b1 100644 --- a/rockspecs/libtls-3.4.1-3.rockspec +++ b/rockspecs/libtls-3.4.1-3.rockspec @@ -22,35 +22,19 @@ external_dependencies = { }, } build = { - type = "builtin", - modules = { - libtls = { - sources = { - "src/libtls.c", - }, - libraries = { - "tls", - }, - incdirs = { - "$(LIBTLS_INCDIR)", - }, - libdirs = { - "$(LIBTLS_LIBDIR)", - }, - }, - ["libtls.config"] = { - sources = { - "src/config.c", - }, - libraries = { - "tls", - }, - incdirs = { - "$(LIBTLS_INCDIR)", - }, - libdirs = { - "$(LIBTLS_LIBDIR)", - }, - }, + type = "make", + build_variables = { + SRCDIR = "src", + CFLAGS = "$(CFLAGS)", + WARNINGS = "-Wall -Wno-trigraphs -Wmissing-field-initializers -Wreturn-type -Wmissing-braces -Wparentheses -Wno-switch -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wuninitialized -Wunknown-pragmas -Wshadow -Wsign-compare", + CPPFLAGS = "-I$(LUA_INCDIR) -I$(LIBTLS_INCDIR)", + LDFLAGS = "$(LIBFLAG) -L$(LIBTLS_LIBDIR) -ltls", + LIB_EXTENSION = "$(LIB_EXTENSION)", + LIBTLS_COVERAGE = "$(LIBTLS_COVERAGE)", + }, + install_variables = { + SRCDIR = "src", + INST_LIBDIR = "$(LIBDIR)", + LIB_EXTENSION = "$(LIB_EXTENSION)", }, } diff --git a/rockspecs/libtls-scm-1.rockspec b/rockspecs/libtls-scm-1.rockspec index 3af29f6..d053860 100644 --- a/rockspecs/libtls-scm-1.rockspec +++ b/rockspecs/libtls-scm-1.rockspec @@ -21,35 +21,19 @@ external_dependencies = { }, } build = { - type = "builtin", - modules = { - libtls = { - sources = { - "src/libtls.c", - }, - libraries = { - "tls", - }, - incdirs = { - "$(LIBTLS_INCDIR)", - }, - libdirs = { - "$(LIBTLS_LIBDIR)", - }, - }, - ["libtls.config"] = { - sources = { - "src/config.c", - }, - libraries = { - "tls", - }, - incdirs = { - "$(LIBTLS_INCDIR)", - }, - libdirs = { - "$(LIBTLS_LIBDIR)", - }, - }, + type = "make", + build_variables = { + SRCDIR = "src", + CFLAGS = "$(CFLAGS)", + WARNINGS = "-Wall -Wno-trigraphs -Wmissing-field-initializers -Wreturn-type -Wmissing-braces -Wparentheses -Wno-switch -Wunused-function -Wunused-label -Wunused-parameter -Wunused-variable -Wunused-value -Wuninitialized -Wunknown-pragmas -Wshadow -Wsign-compare", + CPPFLAGS = "-I$(LUA_INCDIR) -I$(LIBTLS_INCDIR)", + LDFLAGS = "$(LIBFLAG) -L$(LIBTLS_LIBDIR) -ltls", + LIB_EXTENSION = "$(LIB_EXTENSION)", + LIBTLS_COVERAGE = "$(LIBTLS_COVERAGE)", + }, + install_variables = { + SRCDIR = "src", + INST_LIBDIR = "$(LIBDIR)", + LIB_EXTENSION = "$(LIB_EXTENSION)", }, }