diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2011-04-19 11:59:28 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2011-04-19 16:13:42 +1000 |
| commit | 5439553c96bd906e19be7060552cb59bdaec3eb1 (patch) | |
| tree | 0816d7c75c24b2d5cf3b8994aed975f1b2f6885a /source4 | |
| parent | cfb4eb9d8050a52a22679c3261bd3ff8cc7ab1fc (diff) | |
| download | samba-5439553c96bd906e19be7060552cb59bdaec3eb1.tar.gz samba-5439553c96bd906e19be7060552cb59bdaec3eb1.tar.bz2 samba-5439553c96bd906e19be7060552cb59bdaec3eb1.zip | |
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
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/scripting/devel/selftest-vars.sh | 1 | ||||
| -rwxr-xr-x | source4/selftest/tests.py | 2 |
2 files changed, 1 insertions, 2 deletions
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") |