technocloud-public/nginx-unit
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Packages: "test" and "test-debug" targets for rpm.

Browse Source
This commit is contained in:
Andrei Belov
2018-01-26 17:44:26 +03:00
parent 7fe8f72364
commit 9d1410a0bb
3 changed files with 28 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
pkg/rpm/Makefile
View File

@@ -50,7 +50,7 @@ CONFIGURE_ARGS=\
export CR=\\n
default:
@echo "valid targets: all modules unit $(addprefix unit-, $(MODULES)) rpmlint specs clean"
@echo "valid targets: all modules unit $(addprefix unit-, $(MODULES)) rpmlint specs test test-debug clean"
all: check-build-depends unit modules
@@ -172,11 +172,31 @@ unit-%: check-build-depends-% rpmbuild/SPECS/unit-%.spec rpmbuild/SOURCES/unit-$
rpmbuild -D "_topdir `pwd`/rpmbuild" -ba rpmbuild/SPECS/$@.spec && \
ln -s rpmbuild/BUILD/$@-$(VERSION)/build $@
test: unit modules
@{ \
for so in `find rpmbuild/BUILD/*/build-nodebug/ -type f -name "*.so"`; do \
soname=`basename $${so}` ; \
test -h rpmbuild/BUILD/unit-$(VERSION)/build-nodebug/$${soname} || \
ln -fs `pwd`/$${so} rpmbuild/BUILD/unit-$(VERSION)/build-nodebug/$${soname} ; \
done ; \
( cd rpmbuild/BUILD/unit-$(VERSION) && rm -f build && ln -s build-nodebug build && ./test/run.py ) ; \
}
test-debug: unit modules
@{ \
for so in `find rpmbuild/BUILD/*/build-debug/ -type f -name "*.so"`; do \
soname=`basename $${so}` ; \
test -h rpmbuild/BUILD/unit-$(VERSION)/build-debug/$${soname} || \
ln -fs `pwd`/$${so} rpmbuild/BUILD/unit-$(VERSION)/build-debug/$${soname} ; \
done ; \
( cd rpmbuild/BUILD/unit-$(VERSION) && rm -f build && ln -s build-debug build && ./test/run.py ) ; \
}
clean:
rm -rf rpmbuild/SPECS rpmbuild/BUILD rpmbuild/BUILDROOT rpmbuild/RPMS rpmbuild/SRPMS ../../build
rm -f rpmbuild/SOURCES/unit-*.tar.gz unit
find . -maxdepth 1 -type l -delete
.PHONY: default all modules specs check-build-depends rpmlint clean
.PHONY: default all modules specs check-build-depends rpmlint test test-debug clean
.SECONDARY:

6
pkg/rpm/unit.module.spec.in
View File

@@ -63,6 +63,7 @@ make %%MODULE_MAKEARGS%%
--cc-opt="%{CC_OPT}"
./configure %%MODULE_CONFARGS%%
make %%MODULE_MAKEARGS%%
%{__mv} build build-nodebug
%install
%{__rm} -rf %{buildroot}
@@ -70,9 +71,10 @@ make %%MODULE_MAKEARGS%%
%{__install} -m 644 -p NOTICE \
%{buildroot}%{_datadir}/doc/%%NAME%%/COPYRIGHT
%%MODULE_PREINSTALL%%
%{__ln_s} build-debug build
DESTDIR=%{buildroot} make %%MODULE_INSTARGS%%
%{__rm} -rf build
%{__mv} build-debug build
%{__rm} -f build
%{__ln_s} build-nodebug build
DESTDIR=%{buildroot} make %%MODULE_INSTARGS%%
%check

2
pkg/rpm/unit.spec.in
View File

@@ -77,9 +77,11 @@ dynamically via an API.
--cc-opt="%{CC_OPT}" \
--ld-opt="%{LD_OPT}"
%{__make} %{?_smp_mflags}
%{__mv} build build-nodebug
%install
%{__rm} -rf %{buildroot}
%{__ln_s} build-nodebug build
DESTDIR=%{buildroot} make unitd-install
%{__install} -m755 %{bdir}/build-debug/unitd \
%{buildroot}%{_sbindir}/unitd-debug