summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2010-09-04 21:13:37 +0200
committerJelmer Vernooij <jelmer@samba.org>2010-09-04 21:13:37 +0200
commit955076530425b2c37c7ad545f9a596e8daca0321 (patch)
tree5ca3eb5f395b306b2eae9db48c1648b09635b046
parentbde18c6218fa6b593ff4f3db8bcd2f83e9b661aa (diff)
downloadsamba-955076530425b2c37c7ad545f9a596e8daca0321.tar.gz
samba-955076530425b2c37c7ad545f9a596e8daca0321.tar.bz2
samba-955076530425b2c37c7ad545f9a596e8daca0321.zip
testr: Fix configuration to use idfile, in case more than a couple of
hundred tests fail.
-rwxr-xr-xselftest/selftest.pl2
-rw-r--r--source4/.testr.conf4
2 files changed, 3 insertions, 3 deletions
diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 8b890982a1..cf79c83441 100755
--- a/selftest/selftest.pl
+++ b/selftest/selftest.pl
@@ -832,7 +832,7 @@ sub setup_env($)
} elsif (defined(get_running_env($envname))) {
$testenv_vars = get_running_env($envname);
if (not $target->check_env($testenv_vars)) {
- print $self->getlog_env($testenv_vars);
+ print $target->getlog_env($testenv_vars);
$testenv_vars = undef;
}
} else {
diff --git a/source4/.testr.conf b/source4/.testr.conf
index 9261b57a91..d3670bec10 100644
--- a/source4/.testr.conf
+++ b/source4/.testr.conf
@@ -1,3 +1,3 @@
[DEFAULT]
-test_command=../buildtools/bin/waf test --filtered-subunit
-test_id_option=--load-list $IDLIST
+test_command=../buildtools/bin/waf test --filtered-subunit $IDOPTION
+test_id_option=--load-list $IDFILE