Attachment 12582 Details for Bug 12104 – Additional patch for 4.5

[patch] Additional patch for 4.5

BZ12104_4.5_additional.patch (text/plain), 1.66 KB, created by Martin Schwenke on 2016-10-17 04:59:31 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Schwenke

Created: 2016-10-17 04:59:31 UTC

Size: 1.66 KB

patch

obsolete

>From 08792db4498e24b788c571d791d130048113cbac Mon Sep 17 00:00:00 2001
>From: Martin Schwenke <martin@meltin.net>
>Date: Tue, 11 Oct 2016 11:30:37 +1100
>Subject: [PATCH] ctdb-packaging: Move CTDB tests to
> /usr/local/share/ctdb/tests/
>
>In time, other things will end up in /use/local/share/ctdb/.
>
>BUG: https://bugzilla.samba.org/show_bug.cgi?id=12104
>
>Signed-off-by: Martin Schwenke <martin@meltin.net>
>Reviewed-by: Amitay Isaacs <amitay@gmail.com>
>(cherry picked from commit fd8e562069e3c01720be62069b7d58d14c10afd5)
>---
> ctdb/packaging/RPM/ctdb.spec.in | 4 ++--
> ctdb/wscript                    | 2 +-
> 2 files changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/ctdb/packaging/RPM/ctdb.spec.in b/ctdb/packaging/RPM/ctdb.spec.in
>index ea97d8e..aae2c7e 100644
>--- a/ctdb/packaging/RPM/ctdb.spec.in
>+++ b/ctdb/packaging/RPM/ctdb.spec.in
>@@ -257,8 +257,8 @@ test suite for ctdb
> 
> %files tests
> %defattr(-,root,root)
>-%dir %{_datadir}/%{name}-tests
>-%{_datadir}/%{name}-tests/*
>+%dir %{_datadir}/%{name}/tests
>+%{_datadir}/%{name}/tests/*
> %dir %{_libexecdir}/%{name}/tests
> %{_libexecdir}/%{name}/tests/*
> %{_bindir}/ctdb_run_tests
>diff --git a/ctdb/wscript b/ctdb/wscript
>index 5675849..c775cb5 100644
>--- a/ctdb/wscript
>+++ b/ctdb/wscript
>@@ -209,7 +209,7 @@ def configure(conf):
>                     conf.env.CTDB_RUNDIR))
> 
>     conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.EXEC_PREFIX,
>-                                              'share/ctdb-tests')
>+                                              'share/ctdb/tests')
>     conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests')
> 
>     # Allow unified compilation and separate compilation of utilities
>-- 
>2.9.3
>

Flags:

amitay: review+

Actions: View

Attachments on bug 12104: 12312 | 12313 | 12582 | 12583