1 |
unnilennium |
1.1 |
From eb09689c3c1eeae14eeb08352c5342d89b7bf96d Mon Sep 17 00:00:00 2001 |
2 |
|
|
From: Andreas Schneider <asn@samba.org> |
3 |
|
|
Date: Wed, 3 Aug 2016 13:23:31 +0200 |
4 |
|
|
Subject: [PATCH] ctdb-waf: Move ctdb tests to libexec directory |
5 |
|
|
|
6 |
|
|
BUG: https://bugzilla.samba.org/show_bug.cgi?id=12104 |
7 |
|
|
|
8 |
|
|
Signed-off-by: Andreas Schneider <asn@samba.org> |
9 |
|
|
Reviewed-by: Martin Schwenke <martin@meltin.net> |
10 |
|
|
|
11 |
|
|
(cherry picked from commit f9c85d04e9edb3af9479e9c83d5b1ec77b9c2ee2) |
12 |
|
|
--- |
13 |
|
|
ctdb/wscript | 20 ++++++++++---------- |
14 |
|
|
1 file changed, 10 insertions(+), 10 deletions(-) |
15 |
|
|
|
16 |
|
|
diff --git a/ctdb/wscript b/ctdb/wscript |
17 |
|
|
index 5739269..a6d1e68 100755 |
18 |
|
|
--- a/ctdb/wscript |
19 |
|
|
+++ b/ctdb/wscript |
20 |
|
|
@@ -208,7 +208,7 @@ def configure(conf): |
21 |
|
|
|
22 |
|
|
conf.env.CTDB_TEST_DATADIR = os.path.join(conf.env.EXEC_PREFIX, |
23 |
|
|
'share/ctdb-tests') |
24 |
|
|
- conf.env.CTDB_TEST_LIBDIR = os.path.join(conf.env.LIBDIR, 'ctdb-tests') |
25 |
|
|
+ conf.env.CTDB_TEST_LIBEXECDIR = os.path.join(conf.env.LIBEXECDIR, 'ctdb/tests') |
26 |
|
|
|
27 |
|
|
# Allow unified compilation and separate compilation of utilities |
28 |
|
|
# to find includes |
29 |
|
|
@@ -637,12 +637,12 @@ def build(bld): |
30 |
|
|
bld.SAMBA_BINARY(target, |
31 |
|
|
source=src, |
32 |
|
|
deps='talloc tevent tdb tevent-unix-util', |
33 |
|
|
- install_path='${CTDB_TEST_LIBDIR}') |
34 |
|
|
+ install_path='${CTDB_TEST_LIBEXECDIR}') |
35 |
|
|
|
36 |
|
|
bld.SAMBA_BINARY('reqid_test', |
37 |
|
|
source='tests/src/reqid_test.c', |
38 |
|
|
deps='samba-util', |
39 |
|
|
- install_path='${CTDB_TEST_LIBDIR}') |
40 |
|
|
+ install_path='${CTDB_TEST_LIBEXECDIR}') |
41 |
|
|
|
42 |
|
|
# Test binaries |
43 |
|
|
ctdb_tests = [ |
44 |
|
|
@@ -671,7 +671,7 @@ def build(bld): |
45 |
|
|
source=src, |
46 |
|
|
includes='include', |
47 |
|
|
deps='ctdb-client ctdb-common ctdb-util', |
48 |
|
|
- install_path='${CTDB_TEST_LIBDIR}') |
49 |
|
|
+ install_path='${CTDB_TEST_LIBEXECDIR}') |
50 |
|
|
|
51 |
|
|
bld.SAMBA_BINARY('ctdb_takeover_tests', |
52 |
|
|
source='tests/src/ctdb_takeover_tests.c', |
53 |
|
|
@@ -680,21 +680,21 @@ def build(bld): |
54 |
|
|
ctdb-protocol''' + |
55 |
|
|
ib_deps, |
56 |
|
|
includes='include', |
57 |
|
|
- install_path='${CTDB_TEST_LIBDIR}') |
58 |
|
|
+ install_path='${CTDB_TEST_LIBEXECDIR}') |
59 |
|
|
|
60 |
|
|
bld.SAMBA_BINARY('ctdb_functest', |
61 |
|
|
source='tests/src/ctdb_functest.c', |
62 |
|
|
deps='''replace tdb tevent talloc popt ctdb-system |
63 |
|
|
samba-util tdb-wrap''', |
64 |
|
|
includes='include', |
65 |
|
|
- install_path='${CTDB_TEST_LIBDIR}') |
66 |
|
|
+ install_path='${CTDB_TEST_LIBEXECDIR}') |
67 |
|
|
|
68 |
|
|
bld.SAMBA_BINARY('ctdb_stubtest', |
69 |
|
|
source='tests/src/ctdb_test.c', |
70 |
|
|
deps='''replace tdb tevent talloc popt ctdb-system |
71 |
|
|
samba-util tdb-wrap''', |
72 |
|
|
includes='include', |
73 |
|
|
- install_path='${CTDB_TEST_LIBDIR}') |
74 |
|
|
+ install_path='${CTDB_TEST_LIBEXECDIR}') |
75 |
|
|
|
76 |
|
|
if bld.env.HAVE_INFINIBAND: |
77 |
|
|
bld.SAMBA_BINARY('ibwrapper_test', |
78 |
|
|
@@ -702,7 +702,7 @@ def build(bld): |
79 |
|
|
includes='include', |
80 |
|
|
deps='replace talloc ctdb-client ctdb-common' + |
81 |
|
|
ib_deps, |
82 |
|
|
- install_path='${CTDB_TEST_LIBDIR}') |
83 |
|
|
+ install_path='${CTDB_TEST_LIBEXECDIR}') |
84 |
|
|
|
85 |
|
|
test_subdirs = [ |
86 |
|
|
'complex', |
87 |
|
|
@@ -734,7 +734,7 @@ def build(bld): |
88 |
|
|
destname=os.path.join('scripts', t)) |
89 |
|
|
|
90 |
|
|
sed_expr = 's@^TEST_SCRIPTS_DIR=.*@&\\nexport TEST_BIN_DIR=\"%s\"@' % ( |
91 |
|
|
- bld.env.CTDB_TEST_LIBDIR) |
92 |
|
|
+ bld.env.CTDB_TEST_LIBEXECDIR) |
93 |
|
|
bld.SAMBA_GENERATOR('ctdb-test-wrap', |
94 |
|
|
source='tests/scripts/test_wrap', |
95 |
|
|
target='test_wrap', |
96 |
|
|
@@ -743,7 +743,7 @@ def build(bld): |
97 |
|
|
destname='test_wrap', chmod=0755) |
98 |
|
|
|
99 |
|
|
sed_expr1 = 's@^test_dir=.*@test_dir=%s\\nexport TEST_BIN_DIR=\"%s\"@' % ( |
100 |
|
|
- bld.env.CTDB_TEST_DATADIR, bld.env.CTDB_TEST_LIBDIR) |
101 |
|
|
+ bld.env.CTDB_TEST_DATADIR, bld.env.CTDB_TEST_LIBEXECDIR) |
102 |
|
|
sed_expr2 = 's@^\(export CTDB_TESTS_ARE_INSTALLED\)=false@\\1=true@' |
103 |
|
|
bld.SAMBA_GENERATOR('ctdb-test-runner', |
104 |
|
|
source='tests/run_tests.sh', |
105 |
|
|
-- |
106 |
|
|
2.9.2 |
107 |
|
|
|