diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-06-20 14:14:47 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-06-20 14:14:47 +0200 |
| commit | 237ab66f6c292b62b37af05771913b693b32d885 (patch) | |
| tree | 5a5c223a2b07bc6253b2017ec1051c692f1eca8d /selftest | |
| parent | 7a064b9960ab3cfb4ef76a939da7670aa34519a6 (diff) | |
| download | samba-237ab66f6c292b62b37af05771913b693b32d885.tar.gz samba-237ab66f6c292b62b37af05771913b693b32d885.tar.bz2 samba-237ab66f6c292b62b37af05771913b693b32d885.zip | |
selftest: Use scripted testparm.
Diffstat (limited to 'selftest')
| -rw-r--r-- | selftest/target/Samba4.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/selftest/target/Samba4.pm b/selftest/target/Samba4.pm index cd88a93114..c19f162d62 100644 --- a/selftest/target/Samba4.pm +++ b/selftest/target/Samba4.pm @@ -669,13 +669,13 @@ nogroup:x:65534:nobody my $configuration = "--configfile=$ctx->{smb_conf}"; #Ensure the config file is valid before we start - my $testparm = $self->bindir_path("testparm"); + my $testparm = $self->bindir_path("../scripting/bin/testparm"); if (system("$testparm $configuration -v --suppress-prompt >/dev/null 2>&1") != 0) { system("$testparm -v --suppress-prompt $configuration >&2"); die("Failed to create a valid smb.conf configuration $testparm!"); } - (system("($testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global 2> /dev/null | grep -i \"^$ctx->{netbiosname}\" ) >/dev/null 2>&1") == 0) or die("Failed to create a valid smb.conf configuration! $self->{bindir}/testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global"); + (system("($testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global 2> /dev/null | grep -i \"^$ctx->{netbiosname}\" ) >/dev/null 2>&1") == 0) or die("Failed to create a valid smb.conf configuration! $testparm $configuration -v --suppress-prompt --parameter-name=\"netbios name\" --section-name=global"); my $ret = { KRB5_CONFIG => $ctx->{krb5_conf}, |