Permalink
Browse files

rpm: Enable unit tests on Travis via CI variable

  • Loading branch information...
superm1 committed Feb 6, 2018
1 parent bd055f0 commit 46f80b45bdea49b888aeb47d0dab4674e930e957
Showing with 6 additions and 4 deletions.
  1. +1 −1 .travis.yml
  2. +1 −1 Makefile-std
  3. +0 −1 pkg/libsmbios.spec.in
  4. +4 −1 pkg/mk-rel-rpm.sh
View
@@ -13,7 +13,7 @@ install:
- ./pkg/build-dockerfile.sh $OS
script:
- docker run -t -v `pwd`/dist:/build/dist libsmbios-$OS
- docker run -e CI=true -t -v `pwd`/dist:/build/dist libsmbios-$OS
deploy:
provider: releases
View
@@ -74,7 +74,7 @@ AM_RPM_DEFINES = --define "_topdir $(TOPDIR)" \
.PHONY: rpm srpm
rpm: pkg/$(PACKAGE_NAME).spec dist
mkdir -p $(BUILDDIR)
rpmbuild $(AM_RPM_DEFINES) -ba --nodeps $(SPECFILE)
rpmbuild $(AM_RPM_DEFINES) $(CI) -ba --nodeps $(SPECFILE)
rm -rf $(BUILDDIR)
srpm: pkg/$(PACKAGE_NAME).spec dist
View
@@ -26,7 +26,6 @@
# not available in OS on several major OS
%{?_without_unit_tests: %undefine run_unit_tests}
%{?_with_unit_tests: %define run_unit_tests 1}
%define run_unit_tests 1
%{!?as_needed: %define as_needed 1}
%{?_without_as_needed: %undefine as_needed}
View
@@ -16,4 +16,7 @@ rm -rf _builddir
mkdir _builddir
pushd _builddir
../autogen.sh
make rpm
if [ -n "$CI" ]; then
CI="CI=--define '_with_unit_tests 1'"
fi
make rpm "$CI"

0 comments on commit 46f80b4

Please sign in to comment.