selftest: Fix use of --load-list.
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Sep 2010 02:08:37 +0000 (19:08 -0700)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 23 Sep 2010 05:29:08 +0000 (22:29 -0700)
selftest/selftest.pl
source4/selftest/tests.sh

index f973ae589f9b337705432a51e51cda197bd1ac82..5457306c625a87b336a5d3bdcc43ed22344342ae 100755 (executable)
@@ -940,7 +940,7 @@ $envvarstr
                                foreach my $test (@{$individual_tests->{$name}}) {
                                        print $fh "$test\n";
                                }
-                               $cmd .= " --load-list=$listid_file";
+                               $cmd =~ s/\$LOADLIST/--load-list=$listid_file/g;
                        } elsif ($$_[4]) {
                                $cmd =~ s/\s+[^\s]+\s*$//;
                                $cmd .= " " . join(' ', @{$individual_tests->{$name}});
index 4a91affdd06614867a30367bd9aa46a668340559..ed727524558e6847d9c5f808e369f8e6a6a2f1b7 100755 (executable)
@@ -57,7 +57,7 @@ plantestsuite_loadlist() {
        fi
        echo $fullname
        echo $env
-       echo "$cmdline 2>&1 | ../selftest/filter-subunit --prefix=\"$fullname.\""
+       echo "$cmdline \$LOADLIST 2>&1 | ../selftest/filter-subunit --prefix=\"$fullname.\""
 }
 
 plantestsuite_idlist() {