From 677f28d8b2d7324817ced7eb5e03343208b6ac86 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 3 Feb 2011 17:35:54 +1100 Subject: s4-test: fixed setup/ assumption for top level build Pair-Programmed-With: Andrew Bartlett --- source4/scripting/python/samba/tests/samba3sam.py | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'source4/scripting/python/samba/tests/samba3sam.py') diff --git a/source4/scripting/python/samba/tests/samba3sam.py b/source4/scripting/python/samba/tests/samba3sam.py index 59b6e5517c8..a34f0f620c5 100644 --- a/source4/scripting/python/samba/tests/samba3sam.py +++ b/source4/scripting/python/samba/tests/samba3sam.py @@ -31,10 +31,14 @@ import samba.dcerpc.security import samba.ndr from samba.auth import system_session -datadir = os.path.join(os.path.dirname(__file__), - "../../../../../testdata/samba3") def read_datafile(filename): + paths = [ "../../../../../testdata/samba3", + "../../../../testdata/samba3" ] + for p in paths: + datadir = os.path.join(os.path.dirname(__file__), p) + if os.path.exists(datadir): + break return open(os.path.join(datadir, filename), 'r').read() def ldb_debug(l, text): -- cgit