sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-22 13:34:15 +03:00
Code

talloc: Improve testsuite by avoiding path issues

Browse Source 
We now rely on waf to tell us where the helper binary is.

Signed-off-by: Andrew Bartlett <abartlet@samba.org>
Reviewed-by: Garming Sam <garming@catalyst.net.nz>
This commit is contained in:
Andrew Bartlett 2016-02-23 11:04:51 +13:00
parent 623bf4230c
commit cd8d930021
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/talloc/test_magic_differs.sh
View File

@ -4,10 +4,12 @@
echo "test: magic differs"
if [
"`./talloc_test_magic_differs_helper`" != "`./talloc_test_magic_differs_helper`"
]; then
echo "failure: magic remained the same between executions"
helper=$1
m1=$($helper)
m2=$($helper)
if [ $m1 -eq $m2 ]; then
echo "failure: magic remained the same between executions ($m1 vs $m2)"
exit 1
fi

3
lib/talloc/wscript
View File

@ -158,10 +158,11 @@ def test(ctx):
cmd = os.path.join(Utils.g_module.blddir, 'talloc_testsuite')
ret = samba_utils.RUN_COMMAND(cmd)
print("testsuite returned %d" % ret)
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')
magic_ret = samba_utils.RUN_COMMAND(magic_cmd)
magic_ret = samba_utils.RUN_COMMAND(magic_cmd + " " + magic_helper_cmd)
print("magic differs test returned %d" % magic_ret)
pyret = samba_utils.RUN_PYTHON_TESTS(['test_pytalloc.py'])
print("python testsuite returned %d" % pyret)