From 169290896684d52b9d63cb17c0b90a3d63dd9b8d Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Mon, 6 May 2019 15:32:12 +1200 Subject: [PATCH] build: Remove build of replacetort This is built close to the code it tests in lib/replace/wscript_build as replace_testsuite. Signed-off-by: Andrew Bartlett Reviewed-by: Gary Lockyer --- lib/replace/wscript | 9 ++++----- source3/script/tests/test_local_s3.sh | 2 +- source3/wscript_build | 5 ----- 3 files changed, 5 insertions(+), 11 deletions(-) diff --git a/lib/replace/wscript b/lib/replace/wscript index 1d01e1e2b55..29a8d56c318 100644 --- a/lib/replace/wscript +++ b/lib/replace/wscript @@ -866,11 +866,10 @@ def build(bld): deps='replace', cflags=replace_test_cflags) - if bld.env.standalone_replace: - bld.SAMBA_BINARY('replace_testsuite', - source='test/main.c', - deps='replace replace-test', - install=False) + bld.SAMBA_BINARY('replace_testsuite', + source='test/main.c', + deps='replace replace-test', + install=False) # build replacements for stdint.h and stdbool.h if needed bld.SAMBA_GENERATOR('replace_stdint_h', diff --git a/source3/script/tests/test_local_s3.sh b/source3/script/tests/test_local_s3.sh index d5a3d474edb..d92e328d030 100755 --- a/source3/script/tests/test_local_s3.sh +++ b/source3/script/tests/test_local_s3.sh @@ -22,7 +22,7 @@ else echo "Skipping talloctort" fi -testit "replacetort" $VALGRIND $BINDIR/replacetort || \ +testit "replace_testsuite" $VALGRIND $BINDIR/replace_testsuite || \ failed=`expr $failed + 1` if test -x bin/tdbtorture ; then diff --git a/source3/wscript_build b/source3/wscript_build index 1dc8768ded4..fd4101a315f 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -1215,11 +1215,6 @@ bld.SAMBA3_BINARY('smbconftort', ''', install=False) -bld.SAMBA3_BINARY('replacetort', - source='../lib/replace/test/main.c', - deps='replace replace-test', - install=False) - bld.SAMBA3_BINARY('msgtest', source='torture/msgtest.c', deps=''' -- 2.47.3