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 <abartlet@samba.org>
Reviewed-by: Gary Lockyer <gary@catalyst.net.nz>

diff --git a/lib/replace/wscript b/lib/replace/wscript
index 1d01e1e2b555e11007223abe7fb1b7b197c8a42a..29a8d56c318fcf2ae1f87ab96b3a227c8d3c34b5 100644 (file)
--- 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 d5a3d474edb057dbc67d4d1199649255b7134961..d92e328d03011c9966efdc33448c36b1f9aed57d 100755 (executable)
--- 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 1dc8768ded4bf1dc5e07b319946fe5a7dd94ecf5..fd4101a315fac8c37a14f0b74c9c634a60acab59 100644 (file)
--- 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='''