testr: Fix configuration to use idfile, in case more than a couple of

hundred tests fail.

diff --git a/selftest/selftest.pl b/selftest/selftest.pl
index 8b890982a1021138c319857efae3df0d1f95471f..cf79c8344166708dcd623d8e803d8d154d48a07c 100755 (executable)
--- 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 9261b57a916096f7f99962a311d4cf4657b44d33..d3670bec10f6c30aa77b39aa4677a4591b482d04 100644 (file)
--- 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