Log In
Log In
Places
All Projects
Status Monitor
Collapse sidebar
obs:server:fedora:2.8:testing
obs-server
obs-server-2.8-0017-dist-Make-tests-respect-INI...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File obs-server-2.8-0017-dist-Make-tests-respect-INITDDIR-and-SBINDIR-configu.patch of Package obs-server
From fffa87696540a47da407f6ee222a7ca3f1c8418b Mon Sep 17 00:00:00 2001 From: Oleg Girko <ol@infoserver.lv> Date: Thu, 14 Jul 2016 13:11:17 +0100 Subject: [PATCH] [dist] Make tests respect INITDDIR and SBINDIR configuration parameters. Signed-off-by: Oleg Girko <ol@infoserver.lv> --- dist/Makefile | 6 +++--- dist/t/0030-installed-files.t | 12 ++++++------ 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dist/Makefile b/dist/Makefile index 186e870..b06f187 100644 --- a/dist/Makefile +++ b/dist/Makefile @@ -93,12 +93,12 @@ install_tests_appliance: xargs sed -i -e 's|/srv/obs|$(OBS_BACKEND_DATA_DIR)|g' test_unit: - prove -v t/*.t + INITDDIR=$(INITDDIR) SBINDIR=$(SBINDIR) prove -v t/*.t test_system: - prove -v t/*.ts + INITDDIR=$(INITDDIR) SBINDIR=$(SBINDIR) prove -v t/*.ts test_appliance: - prove -v t/*.ta + INITDDIR=$(INITDDIR) SBINDIR=$(SBINDIR) prove -v t/*.ta .PHONY: test_unit test_system diff --git a/dist/t/0030-installed-files.t b/dist/t/0030-installed-files.t index 94974a4..d1bca66 100644 --- a/dist/t/0030-installed-files.t +++ b/dist/t/0030-installed-files.t @@ -9,10 +9,10 @@ export BASH_TAP_ROOT=$(dirname $0) plan tests 7 for i in \ $DESTDIR/etc/logrotate.d/obs-server\ - $DESTDIR/etc/init.d/obssrcserver\ - $DESTDIR/etc/init.d/obsdodup\ - $DESTDIR/usr/sbin/obs_admin\ - $DESTDIR/usr/sbin/obs_serverstatus + $DESTDIR$INITDDIR/obssrcserver\ + $DESTDIR$INITDDIR/obsdodup\ + $DESTDIR$SBINDIR/obs_admin\ + $DESTDIR$SBINDIR/obs_serverstatus do [[ -e $i ]] is $? 0 "Checking $i" @@ -20,8 +20,8 @@ do done for i in \ - $DESTDIR/usr/sbin/rcobssrcserver\ - $DESTDIR/usr/sbin/rcobsdodup + $DESTDIR$SBINDIR/rcobssrcserver\ + $DESTDIR$SBINDIR/rcobsdodup do [[ -L $i ]] is $? 0 "Checking $i" -- 2.9.4
Locations
Projects
Search
Status Monitor
Help
OpenBuildService.org
Documentation
API Documentation
Contact
Support
@OBShq
The Open Build Service is an
openSUSE project
.
Log In
Places
Places
All Projects
Status Monitor