Fix build without the testsuite enabled
This commit is contained in:
parent
3144ccb68a
commit
46102da87c
@ -0,0 +1,26 @@
|
||||
From 9315278f5f0d94116657caaffe1080804abd7087 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schneider <asn@samba.org>
|
||||
Date: Wed, 5 Jul 2017 10:30:35 +0200
|
||||
Subject: [PATCH] unittests: Do not install the test_dummy rpc module
|
||||
|
||||
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12879
|
||||
|
||||
Signed-off-by: Andreas Schneider <asn@samba.org>
|
||||
---
|
||||
testsuite/unittests/wscript | 3 ++-
|
||||
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/testsuite/unittests/wscript b/testsuite/unittests/wscript
|
||||
index ba6ad3c..561cb4b 100644
|
||||
--- a/testsuite/unittests/wscript
|
||||
+++ b/testsuite/unittests/wscript
|
||||
@@ -34,4 +34,5 @@ def build(bld):
|
||||
subsystem='rpc',
|
||||
allow_undefined_symbols=True,
|
||||
init_function='',
|
||||
- internal_module=False)
|
||||
+ internal_module=False,
|
||||
+ install=False)
|
||||
--
|
||||
2.9.4
|
||||
|
@ -1,4 +1,4 @@
|
||||
From 6f3f8ab2db58a4b1f3467d47c6c317c90fed9669 Mon Sep 17 00:00:00 2001
|
||||
From bdcd72b80c90cebed8ae04c2cf55add535abb6af Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Schneider <asn@samba.org>
|
||||
Date: Wed, 5 Jul 2017 10:08:49 +0200
|
||||
Subject: [PATCH] waf: Only build unit tests with selftest enabled
|
||||
@ -30,7 +30,7 @@ index 47d020b..e80f766 100644
|
||||
|
||||
conf.SAMBA_CHECK_UNDEFINED_SYMBOL_FLAGS()
|
||||
diff --git a/wscript_build b/wscript_build
|
||||
index 2ddcdcc..3c97ce1 100644
|
||||
index 2ddcdcc..8758b6d 100644
|
||||
--- a/wscript_build
|
||||
+++ b/wscript_build
|
||||
@@ -124,7 +124,8 @@ bld.RECURSE('libcli/samsync')
|
||||
@ -38,7 +38,7 @@ index 2ddcdcc..3c97ce1 100644
|
||||
bld.RECURSE('source4/lib/policy')
|
||||
bld.RECURSE('libcli/named_pipe_auth')
|
||||
-bld.RECURSE('testsuite/unittests')
|
||||
+if conf.CONFIG_GET('ENABLE_SELFTEST'):
|
||||
+if bld.CONFIG_GET('ENABLE_SELFTEST'):
|
||||
+ bld.RECURSE('testsuite/unittests')
|
||||
|
||||
if bld.CONFIG_GET('KRB5_VENDOR') in (None, 'heimdal'):
|
||||
|
@ -118,6 +118,7 @@ Source201: README.downgrade
|
||||
|
||||
Patch0: samba-4.7.0-unittests-Add-missing-stdint.h-include.patch
|
||||
Patch1: samba-4.7.0-waf-Only-build-unit-tests-with-selftest-enabled.patch
|
||||
Patch2: samba-4.7.0-unittests-Do-not-install-the-test_dummy-rpc-module.patch
|
||||
|
||||
Requires(pre): /usr/sbin/groupadd
|
||||
Requires(post): systemd
|
||||
@ -1069,8 +1070,6 @@ rm -rf %{buildroot}
|
||||
%dir %{_libdir}/samba/auth
|
||||
%{_libdir}/samba/auth/script.so
|
||||
%{_libdir}/samba/auth/unix.so
|
||||
%dir %{_libdir}/samba/rpc
|
||||
%{_libdir}/samba/rpc/test_dummy_module.so
|
||||
%dir %{_libdir}/samba/vfs
|
||||
%{_libdir}/samba/vfs/acl_tdb.so
|
||||
%{_libdir}/samba/vfs/acl_xattr.so
|
||||
|
Loading…
Reference in New Issue
Block a user