summaryrefslogtreecommitdiff
path: root/testsuite
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2019-11-04 17:07:44 +1300
committerAndreas Schneider <asn@cryptomilk.org>2019-11-13 08:42:30 +0000
commit92ce387ed0e02bc3ebc673bcfd7ffbb55c04f57d (patch)
tree8edc43fb24f980b1665556f111ed638bb8bc957c /testsuite
parentdc5788056bcbccdc320aeaad4f35f726632a91a4 (diff)
downloadsamba-92ce387ed0e02bc3ebc673bcfd7ffbb55c04f57d.tar.gz
build: Remove workaround for missing os.path.relpath in Python < 2.6
Signed-off-by: Andrew Bartlett <abartlet@samba.org> Reviewed-by: David Mulder <dmulder@suse.com> Reviewed-by: Andreas Schneider <asn@samba.org>
Diffstat (limited to 'testsuite')
-rw-r--r--testsuite/headers/wscript_build3
1 files changed, 1 insertions, 2 deletions
diff --git a/testsuite/headers/wscript_build b/testsuite/headers/wscript_build
index 477a977e11b..190fe696810 100644
--- a/testsuite/headers/wscript_build
+++ b/testsuite/headers/wscript_build
@@ -1,5 +1,4 @@
import os
-from samba_utils import os_path_relpath
def build_test_headers(task):
'''symlink a header in the build tree'''
@@ -13,7 +12,7 @@ def build_test_headers(task):
f.write('#include "%s"\n' % os.path.normpath(h))
f.close()
-relpath1 = os_path_relpath(bld.srcnode.abspath(), bld.path.abspath())
+relpath1 = os.path.relpath(bld.srcnode.abspath(), bld.path.abspath())
public_headers = []
for h in bld.env.public_headers_list:
public_headers.append(os.path.join(relpath1, bld.env.build_public_headers, h))