diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-08 02:17:47 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-08 02:22:39 +0200 |
| commit | f9facb51207713d1f294038e68909ba7701c61e4 (patch) | |
| tree | 2aa01fbf909738d242f178553e7eb83c787ba420 | |
| parent | 99b2089752e202adbf4113b1854636e1db2f97c7 (diff) | |
| download | samba-f9facb51207713d1f294038e68909ba7701c61e4.tar.gz samba-f9facb51207713d1f294038e68909ba7701c61e4.tar.bz2 samba-f9facb51207713d1f294038e68909ba7701c61e4.zip | |
Move all subunit files to lib directory.
| -rw-r--r-- | lib/subunit/python/__init__.py (renamed from source4/scripting/python/subunit/__init__.py) | 0 | ||||
| -rw-r--r-- | lib/subunit/python/tests/TestUtil.py (renamed from source4/scripting/python/subunit/tests/TestUtil.py) | 0 | ||||
| -rw-r--r-- | lib/subunit/python/tests/__init__.py (renamed from source4/scripting/python/subunit/tests/__init__.py) | 0 | ||||
| -rwxr-xr-x | lib/subunit/python/tests/sample-script.py (renamed from source4/scripting/python/subunit/tests/sample-script.py) | 0 | ||||
| -rwxr-xr-x | lib/subunit/python/tests/sample-two-script.py (renamed from source4/scripting/python/subunit/tests/sample-two-script.py) | 0 | ||||
| -rw-r--r-- | lib/subunit/python/tests/test_test_protocol.py (renamed from source4/scripting/python/subunit/tests/test_test_protocol.py) | 0 | ||||
| -rwxr-xr-x | source4/scripting/bin/subunitrun | 1 | ||||
| -rw-r--r-- | source4/scripting/python/config.mk | 4 |
8 files changed, 3 insertions, 2 deletions
diff --git a/source4/scripting/python/subunit/__init__.py b/lib/subunit/python/__init__.py index 406cd8765b..406cd8765b 100644 --- a/source4/scripting/python/subunit/__init__.py +++ b/lib/subunit/python/__init__.py diff --git a/source4/scripting/python/subunit/tests/TestUtil.py b/lib/subunit/python/tests/TestUtil.py index 1b5ba9c293..1b5ba9c293 100644 --- a/source4/scripting/python/subunit/tests/TestUtil.py +++ b/lib/subunit/python/tests/TestUtil.py diff --git a/source4/scripting/python/subunit/tests/__init__.py b/lib/subunit/python/tests/__init__.py index 544d0e704f..544d0e704f 100644 --- a/source4/scripting/python/subunit/tests/__init__.py +++ b/lib/subunit/python/tests/__init__.py diff --git a/source4/scripting/python/subunit/tests/sample-script.py b/lib/subunit/python/tests/sample-script.py index 223d2f5d9f..223d2f5d9f 100755 --- a/source4/scripting/python/subunit/tests/sample-script.py +++ b/lib/subunit/python/tests/sample-script.py diff --git a/source4/scripting/python/subunit/tests/sample-two-script.py b/lib/subunit/python/tests/sample-two-script.py index d5550842bf..d5550842bf 100755 --- a/source4/scripting/python/subunit/tests/sample-two-script.py +++ b/lib/subunit/python/tests/sample-two-script.py diff --git a/source4/scripting/python/subunit/tests/test_test_protocol.py b/lib/subunit/python/tests/test_test_protocol.py index af31584a97..af31584a97 100644 --- a/source4/scripting/python/subunit/tests/test_test_protocol.py +++ b/lib/subunit/python/tests/test_test_protocol.py diff --git a/source4/scripting/bin/subunitrun b/source4/scripting/bin/subunitrun index 6f1086ad37..bc35c7ce22 100755 --- a/source4/scripting/bin/subunitrun +++ b/source4/scripting/bin/subunitrun @@ -21,6 +21,7 @@ import sys # Find right directory when running from source tree sys.path.insert(0, "bin/python") +sys.path.insert(0, "../lib/subunit/python") from subunit import SubunitTestRunner from unittest import TestProgram diff --git a/source4/scripting/python/config.mk b/source4/scripting/python/config.mk index b494ee6e8d..c88728a9fd 100644 --- a/source4/scripting/python/config.mk +++ b/source4/scripting/python/config.mk @@ -23,7 +23,7 @@ python_misc_OBJ_FILES = $(pyscriptsrcdir)/misc_wrap.o $(python_misc_OBJ_FILES): CFLAGS+=$(CFLAG_NO_UNUSED_MACROS) $(CFLAG_NO_CAST_QUAL) -_PY_FILES = $(shell find $(pyscriptsrcdir)/samba $(pyscriptsrcdir)/subunit -name "*.py") +_PY_FILES = $(shell find $(pyscriptsrcdir)/samba ../lib/subunit/python -name "*.py") $(foreach pyfile, $(_PY_FILES),$(eval $(call python_py_module_template,$(patsubst $(pyscriptsrcdir)/%,%,$(pyfile)),$(pyfile)))) @@ -32,6 +32,6 @@ $(eval $(call python_py_module_template,samba/misc.py,$(pyscriptsrcdir)/misc.py) EPYDOC_OPTIONS = --no-private --url http://www.samba.org/ --no-sourcecode epydoc:: pythonmods - PYTHONPATH=$(pythonbuilddir) epydoc $(EPYDOC_OPTIONS) samba tdb ldb subunit + PYTHONPATH=$(pythonbuilddir):../lib/subunit/python epydoc $(EPYDOC_OPTIONS) samba tdb ldb subunit install:: installpython |