diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/script/tests/Samba4.pm | 4 | ||||
| -rwxr-xr-x | source4/script/tests/selftest.pl | 18 |
2 files changed, 10 insertions, 12 deletions
diff --git a/source4/script/tests/Samba4.pm b/source4/script/tests/Samba4.pm index 95eaf7f67e..b891b4dc7b 100644 --- a/source4/script/tests/Samba4.pm +++ b/source4/script/tests/Samba4.pm @@ -18,7 +18,7 @@ sub new($$$$) { sub slapd_start($$) { - my $count = 0; + my $count = 0; my ($self, $env_vars) = @_; my $conf = $env_vars->{SLAPD_CONF}; @@ -172,7 +172,7 @@ sub provision_dc($$) sub provision_ldap($$) { my ($self, $envvars) = @_; - system("$self->{bindir}/smbscript $self->{setupdir}/provision $envvars->{PROVISION_OPTIONS} \"$envvars->{PROVISION_ACI}\" --ldap-backend=$envvars->{LDAP_URI}") and + system("$self->{bindir}/smbscript $self->{setupdir}/provision $envvars->{PROVISION_OPTIONS} \"$envvars->{PROVISION_ACI}\" --ldap-backend=$envvars->{LDAP_URI}") and die("LDAP PROVISIONING failed: $self->{bindir}/smbscript $self->{setupdir}/provision $envvars->{PROVISION_OPTIONS} \"$envvars->{PROVISION_ACI}\" --ldap-backend=$envvars->{LDAP_URI}"); } diff --git a/source4/script/tests/selftest.pl b/source4/script/tests/selftest.pl index 2c9f625600..fa4de4dde4 100755 --- a/source4/script/tests/selftest.pl +++ b/source4/script/tests/selftest.pl @@ -321,7 +321,7 @@ Behaviour: } my $result = GetOptions ( - 'help|h|?' => \$opt_help, + 'help|h|?' => \$opt_help, 'target=s' => \$opt_target, 'prefix=s' => \$prefix, 'socket-wrapper' => \$opt_socket_wrapper, @@ -349,7 +349,7 @@ my $tests = shift; # quick hack to disable rpc validation when using valgrind - its way too slow unless (defined($ENV{VALGRIND})) { $ENV{VALIDATE} = "validate"; - $ENV{MALLOC_CHECK_} = 2; + $ENV{MALLOC_CHECK_} = 2; } my $old_pwd = "$RealBin/../.."; @@ -434,11 +434,11 @@ if (defined($opt_skip)) { } my $interfaces = join(',', ("127.0.0.6/8", - "127.0.0.7/8", - "127.0.0.8/8", - "127.0.0.9/8", - "127.0.0.10/8", - "127.0.0.11/8")); + "127.0.0.7/8", + "127.0.0.8/8", + "127.0.0.9/8", + "127.0.0.10/8", + "127.0.0.11/8")); my $conffile = "$prefix/client.conf"; @@ -463,9 +463,7 @@ sub write_clientconf($$) } else { print CF "\ticonv:native = false\n"; } - print CF -" netbios name = client -"; + print CF "\tnetbios name = client\n"; if (defined($vars->{DOMAIN})) { print CF "\tworkgroup = $vars->{DOMAIN}\n"; } |