pyldb: avoid segfault when adding an element with no name

[sfrench/samba-autobuild/.git] / testsuite / headers / wscript_build

diff --git a/testsuite/headers/wscript_build b/testsuite/headers/wscript_build
index f612ad92615dc5dcdaf4866a32719beb4cdeb75e..477a977e11bb33c333176201f8eb51eefd0346af 100644 (file)
--- a/testsuite/headers/wscript_build
+++ b/testsuite/headers/wscript_build
@@ -8,16 +8,12 @@ def build_test_headers(task):
     f.write('/* generated header test */\n')
     hlist = task.env.public_headers_list[:]
     hlist.sort()
-    # We need to include tdb.h before ntdb.h.  It's the rules!
-    if 'tdb.h' in hlist and 'ntdb.h' in hlist:
-        hlist.remove('ntdb.h')
-        hlist.append('ntdb.h')
 
     for h in hlist:
         f.write('#include "%s"\n' % os.path.normpath(h))
     f.close()
 
-relpath1 = os_path_relpath(bld.srcnode.abspath(), bld.curdir)
+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))
@@ -28,22 +24,13 @@ bld.SAMBA_GENERATOR('test_headers.h',
                     source=public_headers,
                     target='test_headers.h')
 
-cflags=''
-for lib in ['talloc', 'tevent', 'tdb', 'ldb', 'popt' ]:
-    ename = 'CPPPATH_%s' % lib.upper()
-    for p in bld.env[ename]:
-        cflags += bld.env.CPPPATH_ST % p + ' '
-
-if not bld.env.USING_SYSTEM_POPT:
-    cflags += bld.env.CPPPATH_ST % '../third_party/popt'
-
 if bld.env.DEVELOPER_MODE:
     bld.SAMBA_BINARY('test_headers',
                      source='test_headers.c',
                      includes="#include/public",
                      pyembed=True,
-                     cflags=cflags,
                      local_include=True,
                      global_include=False,
                      use_global_deps=False,
-                     install=False)
+                     install=False,
+                     deps='talloc tdb ldb tevent popt')