This repository was archived by the owner on Mar 22, 2023. It is now read-only.
File tree Expand file tree Collapse file tree 2 files changed +13
-14
lines changed
Expand file tree Collapse file tree 2 files changed +13
-14
lines changed Original file line number Diff line number Diff line change @@ -47,6 +47,7 @@ ARG TESTS_DEPS="\
4747 libpmem-devel \
4848 libunwind-devel \
4949 pmempool \
50+ rpm-build \
5051 valgrind-devel"
5152
5253# Misc for our builds/CI (optional)
Original file line number Diff line number Diff line change @@ -215,23 +215,21 @@ function tests_package() {
215215
216216 [ ! " ${TESTS_PACKAGES} " = " ON" ] && echo " Skipping testing packages, TESTS_PACKAGES variable is not set."
217217
218- if ! ls /opt/pmdk-pkg/libpmem* > /dev/null 2>&1 ; then
219- echo " ERROR: There are no PMDK packages in /opt/pmdk-pkg - they are required for package test(s)."
220- printf " $( tput setaf 1) $( tput setab 7) BUILD ${FUNCNAME[0]} END$( tput sgr 0) \n\n"
221- return 1
222- fi
223-
224218 mkdir build
225219 cd build
226220
227- if [ ${PACKAGE_MANAGER} = " deb" ]; then
228- sudo_password dpkg -i /opt/pmdk-pkg/libpmem_* .deb /opt/pmdk-pkg/libpmem-dev_* .deb
229- sudo_password dpkg -i /opt/pmdk-pkg/libpmemobj_* .deb /opt/pmdk-pkg/libpmemobj-dev_* .deb
230- elif [ ${PACKAGE_MANAGER} = " rpm" ]; then
231- sudo_password rpm -i /opt/pmdk-pkg/libpmem* .rpm /opt/pmdk-pkg/pmdk-debuginfo-* .rpm
232- else
233- echo " ERROR: skipping building of packages because PACKAGE_MANAGER is not equal to 'rpm' nor 'deb' ..."
234- return 1
221+ if ls /opt/pmdk-pkg/libpmem* > /dev/null 2>&1 ; then
222+ echo " There are packages to install in '/opt/pmdk-pkg'"
223+
224+ if [ ${PACKAGE_MANAGER} = " deb" ]; then
225+ sudo_password dpkg -i /opt/pmdk-pkg/libpmem_* .deb /opt/pmdk-pkg/libpmem-dev_* .deb
226+ sudo_password dpkg -i /opt/pmdk-pkg/libpmemobj_* .deb /opt/pmdk-pkg/libpmemobj-dev_* .deb
227+ elif [ ${PACKAGE_MANAGER} = " rpm" ]; then
228+ sudo_password rpm -i /opt/pmdk-pkg/libpmem* .rpm /opt/pmdk-pkg/pmdk-debuginfo-* .rpm
229+ else
230+ echo " ERROR: we found packages to install, but PACKAGE_MANAGER is not set (to 'rpm', or 'deb')!"
231+ return 1
232+ fi
235233 fi
236234
237235 CC=gcc CXX=g++ \
You can’t perform that action at this time.
0 commit comments