s4/drs-tests: Inherit DrsReplSchemaTestCase from DrsBaseTestCase

[metze/samba/wip.git] / wscript

diff --git a/wscript b/wscript
index 376bd0f40030709ea4dfabeb0ff3f6033a8140db..22f864f0986f227f9b86929bfc3972fb9cd8e273 100644 (file)
--- a/wscript
+++ b/wscript
@@ -62,7 +62,7 @@ def configure(conf):
     # this enables smbtorture.static for s3 in the build farm
     conf.env.BUILD_FARM = Options.options.BUILD_FARM or os.environ.get('RUN_FROM_BUILD_FARM')
 
-    conf.ADD_EXTRA_INCLUDES('#source4 #lib #source4/lib #source4/include #includexxx #include #includeyyy')
+    conf.ADD_EXTRA_INCLUDES('#source4 #lib #source4/lib #source4/include #include')
 
     conf.RECURSE('lib/replace')
 
@@ -107,14 +107,14 @@ def configure(conf):
     # we don't want any libraries or modules to rely on runtime
     # resolution of symbols
     if sys.platform != "openbsd4":
-        conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
+        conf.env.undefined_ldflags = conf.ADD_LDFLAGS('-Wl,-no-undefined', testflags=True)
 
     # gentoo always adds this. We want our normal build to be as
     # strict as the strictest OS we support, so adding this here
     # allows us to find problems on our development hosts faster.
     # It also results in faster load time.
     if sys.platform != "openbsd4":
-        conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
+        conf.env.asneeded_ldflags = conf.ADD_LDFLAGS('-Wl,--as-needed', testflags=True)
 
     if not conf.CHECK_NEED_LC("-lc not needed"):
         conf.ADD_LDFLAGS('-lc', testflags=False)
@@ -131,7 +131,7 @@ def etags(ctx):
     '''build TAGS file using etags'''
     import Utils
     source_root = os.path.dirname(Utils.g_module.root_path)
-    cmd = 'etags $(find %s/.. -name "*.[ch]" | egrep -v \.inst\.)' % source_root
+    cmd = 'etags $(find %s -name "*.[ch]" | egrep -v \.inst\.)' % source_root
     print("Running: %s" % cmd)
     os.system(cmd)
 
@@ -139,7 +139,7 @@ def ctags(ctx):
     "build 'tags' file using ctags"
     import Utils
     source_root = os.path.dirname(Utils.g_module.root_path)
-    cmd = 'ctags $(find %s/.. -name "*.[ch]" | grep -v "*_proto\.h" | egrep -v \.inst\.)' % source_root
+    cmd = 'ctags $(find %s -name "*.[ch]" | grep -v "*_proto\.h" | egrep -v \.inst\.)' % source_root
     print("Running: %s" % cmd)
     os.system(cmd)