talloc: Fix execution of test_magic_differs from tarball
authorLukas Slebodnik <lslebodn@redhat.com>
Mon, 3 Jul 2017 14:17:44 +0000 (16:17 +0200)
committerAndreas Schneider <asn@cryptomilk.org>
Tue, 4 Jul 2017 19:39:21 +0000 (21:39 +0200)
make check failed in case of tarball because test_magic_differs.sh
is in top level directory and not in sub-directory lib/talloc

  sh: ./lib/talloc/test_magic_differs.sh: No such file or directory
  magic differs test returned 127

Signed-off-by: Lukas Slebodnik <lslebodn@redhat.com>
Reviewed-by: Andrew Bartlet <abartlet@samba.org>
Reviewed-by: Andreas Schneider <asn@samba.org>
lib/talloc/wscript

index 90839ad8f69a587051bc9cb75dcb4ca7eb837314..09f780b48b29e5d75d0fe4380ff3680074cb71c9 100644 (file)
@@ -181,6 +181,8 @@ def test(ctx):
     magic_helper_cmd = os.path.join(Utils.g_module.blddir, 'talloc_test_magic_differs_helper')
     magic_cmd = os.path.join(srcdir, 'lib', 'talloc',
                              'test_magic_differs.sh')
+    if not os.path.exists(magic_cmd):
+        magic_cmd = os.path.join(srcdir, 'test_magic_differs.sh')
 
     magic_ret = samba_utils.RUN_COMMAND(magic_cmd + " " +  magic_helper_cmd)
     print("magic differs test returned %d" % magic_ret)