diff options
| -rwxr-xr-x | selftest/selftest.pl | 1 | ||||
| -rwxr-xr-x | source3/selftest/tests.py | 2 | ||||
| -rw-r--r-- | source4/scripting/devel/selftest-vars.sh | 1 | ||||
| -rwxr-xr-x | source4/selftest/tests.py | 2 |
4 files changed, 2 insertions, 4 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl index 38d2ab7576..1c8436bb04 100755 --- 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 5e5b1b0d28..f05e00537d 100755 --- 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 c4827422df..bc73c05407 100644 --- 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 34af061695..92ab28c2be 100755 --- 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") |