diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-04-07 00:26:28 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-04-07 00:29:28 +0200 |
| commit | c349aa3619efde5e00fd0d05f0670a7b6c2f3327 (patch) | |
| tree | e5605acebab2178ef48c3f06ef6940c30b52d62d | |
| parent | 4d482d9c192a8905dcd6bf18d375e565f87067bd (diff) | |
| download | samba-c349aa3619efde5e00fd0d05f0670a7b6c2f3327.tar.gz samba-c349aa3619efde5e00fd0d05f0670a7b6c2f3327.tar.bz2 samba-c349aa3619efde5e00fd0d05f0670a7b6c2f3327.zip | |
s4-python: Use standard infrastructure for finding included testtools, subunit and iso8601.
| -rw-r--r-- | lib/subunit/python/wscript_build | 19 | ||||
| -rw-r--r-- | source4/scripting/python/wscript_build | 2 | ||||
| -rw-r--r-- | source4/wscript_build | 1 |
3 files changed, 0 insertions, 22 deletions
diff --git a/lib/subunit/python/wscript_build b/lib/subunit/python/wscript_build deleted file mode 100644 index f99ba42f04..0000000000 --- a/lib/subunit/python/wscript_build +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python - - -# install out various python scripts for use by make test - -bld.SAMBA_SCRIPT('python_iso8601', - pattern='iso8601/**/*.py', - installdir='python') - - -bld.SAMBA_SCRIPT('python_subunit', - pattern='subunit/**/*.py', - installdir='python') - - -bld.SAMBA_SCRIPT('python_testtools', - pattern='testtools/**/*.py', - installdir='python') - diff --git a/source4/scripting/python/wscript_build b/source4/scripting/python/wscript_build index 2a09869a21..96de643b4f 100644 --- a/source4/scripting/python/wscript_build +++ b/source4/scripting/python/wscript_build @@ -23,9 +23,7 @@ bld.SAMBA_PYTHON('python_uuid', bld.SAMBA_PYTHON('python_glue', source='pyglue.c', - # _PY_FILES='$(shell find samba ../lib/subunit/python -type f -name "*.py")', deps='LIBNDR ldb SAMDB CREDENTIALS pyldb python_dcerpc_misc python_dcerpc_security pyauth pyldb_util pyparam_util', - # EPYDOC_OPTIONS='--no-private --url http://www.samba.org/ --no-sourcecode', realname='samba/glue.so' ) diff --git a/source4/wscript_build b/source4/wscript_build index d128a85299..0fbd05914e 100644 --- a/source4/wscript_build +++ b/source4/wscript_build @@ -48,7 +48,6 @@ bld.RECURSE('lib/ldb') bld.RECURSE('dynconfig') bld.RECURSE('../lib/util/charset') bld.RECURSE('scripting/python') -bld.RECURSE('../lib/subunit/python') bld.RECURSE('param') bld.RECURSE('librpc') bld.RECURSE('dsdb') |