s3-build: Remove unused hooks to set smbtorture4 and test args

These were left around after the selftest.pl script was introduced.

Andrew Bartlett

Autobuild-User: Andrew Bartlett <abartlet@samba.org>
Autobuild-Date: Mon Jan  9 06:13:21 CET 2012 on sn-devel-104

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 2dcb71b69421cdcabf11eb0e2577d772f08b67f7..532cd79d88fd2d4d355205ffc54efa5c0791c8b6 100644 (file)
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -53,9 +53,6 @@ LMHOSTSFILE=@LMHOSTSFILE@
 SMB_PASSWD_FILE=@SMB_PASSWD_FILE@
 
 selftest_prefix=@selftest_prefix@
-selftest_shrdir=@selftest_shrdir@
-smbtorture4_option=@smbtorture4_option@
-selftest_custom_conf=@selftest_custom_conf@
 
 LIBS=@LIBS@
 CC=@CC@
@@ -3503,8 +3500,6 @@ test_pam_modules:: pam_modules
 ## Targets for 'make test'
 ##
 
-TEST_EXTRA_ARGS = ${smbtorture4_option} ${selftest_shrdir} ${selftest_custom_conf}
-
 valgrindtest:: all torture timelimit
        @echo Running Test suite with valgrind
        @$(MAKE) test \

diff --git a/source3/configure.in b/source3/configure.in
index e39d4392151527d4cefd36983fec8d623b5b4e54..32561fa72c9f7e9943d984d3d8c02efc5aab720d 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -7069,13 +7069,6 @@ fi
 m4_include(../lib/zlib/zlib.m4)
 
 if test x$smbtorture4_possible = xyes; then
-       saved_USESHARED="$USESHARED"
-       USESHARED="false"
-       smbtorture4_path="bin/smbtorture4"
-       smbtorture4_option="-t bin/smbtorture4"
-       AC_SUBST(smbtorture4_path)
-       AC_SUBST(smbtorture4_option)
-       USESHARED="$saved_USESHARED"
        SMBTORTURE4="bin/smbtorture4"
        AC_SUBST(SMBTORTURE4)
 fi

diff --git a/source3/m4/check_path.m4 b/source3/m4/check_path.m4
index be31782f2b845d022145fbf13f84184b7d99da1a..f0b98c9d53ad22ee88169420050bdf50de22c804 100644 (file)
--- a/source3/m4/check_path.m4
+++ b/source3/m4/check_path.m4
@@ -27,64 +27,6 @@ AC_ARG_WITH(selftest-prefix,
   esac
 ])
 
-#################################################
-# set shrdir for 'make test'
-selftest_shrdir=""
-AC_SUBST(selftest_shrdir)
-AC_ARG_WITH(selftest-shrdir,
-[AS_HELP_STRING([--with-selftest-shrdir=DIR], [The share directory that make test will be run against ($selftest_shrdir)])],
-[ case "$withval" in
-  yes|no)
-    AC_MSG_WARN([--with-selftest-shrdir called without argument - will use default])
-  ;;
-  * )
-    selftest_shrdir="-s $withval"
-    ;;
-  esac
-])
-
-#################################################
-# set path of samba4's smbtorture
-smbtorture4_path=""
-AC_SUBST(smbtorture4_path)
-smbtorture4_option=""
-AC_SUBST(smbtorture4_option)
-AC_ARG_WITH(smbtorture4_path,
-[AS_HELP_STRING([--with-smbtorture4-path=PATH], [The path to a samba4 smbtorture for make test (none)])],
-[ case "$withval" in
-  yes|no)
-    AC_MSG_ERROR([--with-smbtorture4-path should take a path])
-  ;;
-  * )
-    smbtorture4_path="$withval"
-    if test -z "$smbtorture4_path" -a ! -f $smbtorture4_path; then
-       AC_MSG_ERROR(['$smbtorture_path' does not  exist!])
-    fi
-    smbtorture4_option="-t $withval"
-  ;;
- esac
-])
-
-#################################################
-# set custom conf for make test
-selftest_custom_conf=""
-AC_SUBST(selftest_custom_conf)
-AC_ARG_WITH(selftest_custom_conf,
-[AS_HELP_STRING([--with-selftest-custom-conf=PATH], [An optional custom smb.conf that is included in the server smb.conf during make test(none)])],
-[ case "$withval" in
-  yes|no)
-    AC_MSG_ERROR([--with-selftest-custom-conf should take a path])
-  ;;
-  * )
-    selftest_custom_conf="$withval"
-    if test -z "$selftest_custom_conf" -a ! -f $selftest_custom_conf; then
-       AC_MSG_ERROR(['$selftest_custom_conf' does not  exist!])
-    fi
-    selftest_custom_conf="-c $withval"
-  ;;
- esac
-])
-
 ## check for --enable-debug first before checking CFLAGS before
 ## so that we don't mix -O and -g
 debug=no