selftest: Don't specify SELFTEST_TARGET as an env variable

It is much more reliable to specify it as a direct parameter, and this
is needed for the combined 'make test'.

Andrew Bartlett

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 38d2ab75769a85821f34e2f5b7ba98583e69ad01..1c8436bb04d317a485c5df7bd282a4507372be90 100755 (executable)
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -706,7 +706,6 @@ if ($opt_quick) {
 } else {
        $ENV{SELFTEST_QUICK} = "";
 }
-$ENV{SELFTEST_TARGET} = $opt_target;
 $ENV{SELFTEST_MAXTIME} = $torture_maxtime;
 
 my @available = ();

diff --git a/source3/selftest/tests.py b/source3/selftest/tests.py
index 5e5b1b0d28bdc7561fc5fce519ce093373922709..f05e00537d951fcbab0e1893f40bf903bd180e83 100755 (executable)
--- a/source3/selftest/tests.py
+++ b/source3/selftest/tests.py
@@ -29,7 +29,7 @@ configuration = "--configfile=$SMB_CONF_PATH"
 scriptdir=os.path.join(samba3srcdir, "../script/tests")
 
 torture_options = [configuration, "--maximum-runtime=$SELFTEST_MAXTIME", 
-                   "--target=$SELFTEST_TARGET", "--basedir=$SELFTEST_TMPDIR",
+                   "--target=samba3", "--basedir=$SELFTEST_TMPDIR",
                    '--option="torture:winbindd_netbios_name=$SERVER"',
                    '--option="torture:winbindd_netbios_domain=$DOMAIN"', 
                    '--option=torture:sharedelay=100000']

diff --git a/source4/scripting/devel/selftest-vars.sh b/source4/scripting/devel/selftest-vars.sh
index c4827422dff1c007954e4ae5a2c8205e7279c392..bc73c0540782d1d303c207bd4d69a7fd3cccdc9c 100644 (file)
--- a/source4/scripting/devel/selftest-vars.sh
+++ b/source4/scripting/devel/selftest-vars.sh
@@ -13,7 +13,6 @@ export RPC_PROXY_SERVER=localrpcproxy4
 export RPC_PROXY_SERVER_IP=127.0.0.4
 export RPC_PROXY_NETBIOSNAME=localrpcproxy4
 export RPC_PROXY_NETBIOSALIAS=localrpcproxy
-export SELFTEST_TARGET="samba4"
 export SELFTEST_MAXTIME=1200
 export NETBIOSNAME=localdc1
 export REALM=SAMBA.EXAMPLE.COM

diff --git a/source4/selftest/tests.py b/source4/selftest/tests.py
index 34af061695f23cb27d4df3a6e587f1564b1eeeb6..92ab28c2be9feb777c10380b7301ce9eebcf7d15 100755 (executable)
--- a/source4/selftest/tests.py
+++ b/source4/selftest/tests.py
@@ -47,7 +47,7 @@ bbdir = os.path.join(srcdir(), "testprogs/blackbox")
 
 configuration = "--configfile=$SMB_CONF_PATH"
 
-torture_options = [configuration, "--maximum-runtime=$SELFTEST_MAXTIME", "--target=$SELFTEST_TARGET", "--basedir=$SELFTEST_TMPDIR"]
+torture_options = [configuration, "--maximum-runtime=$SELFTEST_MAXTIME", "--target=samba4", "--basedir=$SELFTEST_TMPDIR"]
 if not os.getenv("SELFTEST_VERBOSE"):
     torture_options.append("--option=torture:progress=no")
 torture_options.append("--format=subunit")