[SCM] Samba Shared Repository - branch master updated
Michael Adam
obnox at samba.org
Wed Oct 28 23:43:03 UTC 2015
The branch, master has been updated
via 6e3cb6b s4:torture: fix a comment typo.
via 1466e27 build:wafsamba: Removed hard-coded class names from build scripts
from 6404c07 ldb: Fix a "ignoring return value" warning
https://git.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 6e3cb6b24ff53453c52251965bcf955e2e59fa37
Author: Michael Adam <obnox at samba.org>
Date: Wed Oct 28 20:41:33 2015 +0100
s4:torture: fix a comment typo.
Signed-off-by: Michael Adam <obnox at samba.org>
Reviewed-by: Ralph Boehme <slow at samba.org>
Autobuild-User(master): Michael Adam <obnox at samba.org>
Autobuild-Date(master): Thu Oct 29 00:42:49 CET 2015 on sn-devel-104
commit 1466e27fa612b0e09e78dea75c65516e76529ff6
Author: Thomas Nagy <tnagy at waf.io>
Date: Wed Oct 28 21:04:28 2015 +0100
build:wafsamba: Removed hard-coded class names from build scripts
Using hard-coded class names prevents subclassing and make it hard
to reason about the workflow. The wscript files read during the build
must be read during the installation phase as well.
Signed-off-by: Thomas Nagy <tnagy at waf.io>
Reviewed-by: Andrew Bartlett <abartlet at samba.org>
Reviewed-by: David Disseldorp <ddiss at samba.org>
Reviewed-by: Michael Adam <obnox at samba.org>
-----------------------------------------------------------------------
Summary of changes:
buildtools/wafsamba/samba_utils.py | 7 +++----
source4/torture/basic/misc.c | 2 +-
2 files changed, 4 insertions(+), 5 deletions(-)
Changeset truncated at 500 lines:
diff --git a/buildtools/wafsamba/samba_utils.py b/buildtools/wafsamba/samba_utils.py
index f7bb11c..36d3929 100644
--- a/buildtools/wafsamba/samba_utils.py
+++ b/buildtools/wafsamba/samba_utils.py
@@ -2,7 +2,7 @@
# and for SAMBA_ macros for building libraries, binaries etc
import os, sys, re, fnmatch, shlex
-import Build, Options, Utils, Task, Logs
+import Build, Options, Utils, Task, Logs, Configure
from TaskGen import feature, before
from Configure import conf, ConfigurationContext
from Logs import debug
@@ -656,11 +656,10 @@ def PROCESS_SEPARATE_RULE(self, rule):
You should have file named wscript_<stage>_rule in the current directory
where stage is either 'configure' or 'build'
'''
- ctxclass = self.__class__.__name__
stage = ''
- if ctxclass == 'ConfigurationContext':
+ if isinstance(self, Configure.ConfigurationContext):
stage = 'configure'
- elif ctxclass == 'BuildContext':
+ elif isinstance(self, Build.BuildContext):
stage = 'build'
file_path = os.path.join(self.curdir, WSCRIPT_FILE+'_'+stage+'_'+rule)
txt = load_file(file_path)
diff --git a/source4/torture/basic/misc.c b/source4/torture/basic/misc.c
index 721727b..98423df 100644
--- a/source4/torture/basic/misc.c
+++ b/source4/torture/basic/misc.c
@@ -234,7 +234,7 @@ bool torture_holdcon(struct torture_context *tctx)
/*
open a file N times on the server and just hold them open
used for testing performance when there are N file handles
- alopenn
+ open
*/
bool torture_holdopen(struct torture_context *tctx,
struct smbcli_state *cli)
--
Samba Shared Repository
More information about the samba-cvs
mailing list