Log In
Log In
Places
All Projects
Status Monitor
Collapse sidebar
obs:server:fedora:2.10
obs-server
obs-server-2.10-0014-dist-Make-tests-respect-SB...
Overview
Repositories
Revisions
Requests
Users
Attributes
Meta
File obs-server-2.10-0014-dist-Make-tests-respect-SBINDIR-configuration-parame.patch of Package obs-server
From 928e329034d8936376a6de78ac9e649c78e97bd1 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 SBINDIR configuration parameter. Signed-off-by: Oleg Girko <ol@infoserver.lv> --- dist/Makefile | 6 +++--- dist/t/0030-installed-files.t | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/dist/Makefile b/dist/Makefile index cbacffed2f..384a48fed8 100644 --- a/dist/Makefile +++ b/dist/Makefile @@ -103,12 +103,12 @@ install_tests_appliance: xargs sed -i -e 's|/srv/obs|$(OBS_BACKEND_DATA_DIR)|g' test_unit: - prove -v t/*.t + SBINDIR=$(SBINDIR) prove -v t/*.t test_system: - prove -v t/*.ts + SBINDIR=$(SBINDIR) prove -v t/*.ts test_appliance: - prove -v t/*.ta + 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 1681c0e685..5013a19231 100644 --- a/dist/t/0030-installed-files.t +++ b/dist/t/0030-installed-files.t @@ -9,8 +9,8 @@ export BASH_TAP_ROOT=$(dirname $0) plan tests 5 for i in \ $DESTDIR/etc/logrotate.d/obs-server\ - $DESTDIR/usr/sbin/obs_admin\ - $DESTDIR/usr/sbin/obs_serverstatus + $DESTDIR$SBINDIR/obs_admin\ + $DESTDIR$SBINDIR/obs_serverstatus do [[ -e $i ]] is $? 0 "Checking $i" @@ -18,8 +18,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.35.3
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