diff options
| author | Michael Adam <obnox@samba.org> | 2012-05-29 12:10:16 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2012-05-31 04:46:05 +0200 |
| commit | 24bdec94d7b808e184734303c26788f7618897d0 (patch) | |
| tree | c84682a7be0dd26e167da9e20a2cb2095d846ee7 | |
| parent | 3d504b8a63c51737ed162add75a93d3a725445f3 (diff) | |
| download | samba-24bdec94d7b808e184734303c26788f7618897d0.tar.gz samba-24bdec94d7b808e184734303c26788f7618897d0.tar.bz2 samba-24bdec94d7b808e184734303c26788f7618897d0.zip | |
s3:selftest: introduce a variable for binpath('nmblookup3') in tests.py
| -rwxr-xr-x | selftest/target/Samba3.pm | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/selftest/target/Samba3.pm b/selftest/target/Samba3.pm index d55c6d75b8..098f532094 100755 --- a/selftest/target/Samba3.pm +++ b/selftest/target/Samba3.pm @@ -1085,11 +1085,12 @@ sub wait_for_start($$) print "delaying for nbt name registration\n"; sleep(10); # This will return quickly when things are up, but be slow if we need to wait for (eg) SSL init - system(Samba::bindir_path($self, "nmblookup3") ." $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} __SAMBA__"); - system(Samba::bindir_path($self, "nmblookup3") ." $envvars->{CONFIGURATION} __SAMBA__"); - system(Samba::bindir_path($self, "nmblookup3") ." $envvars->{CONFIGURATION} -U 127.255.255.255 __SAMBA__"); - system(Samba::bindir_path($self, "nmblookup3") ." $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} $envvars->{SERVER}"); - system(Samba::bindir_path($self, "nmblookup3") ." $envvars->{CONFIGURATION} $envvars->{SERVER}"); + my $nmblookup = Samba::bindir_path($self, "nmblookup3"); + system("$nmblookup $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} __SAMBA__"); + system("$nmblookup $envvars->{CONFIGURATION} __SAMBA__"); + system("$nmblookup $envvars->{CONFIGURATION} -U 127.255.255.255 __SAMBA__"); + system("$nmblookup $envvars->{CONFIGURATION} -U $envvars->{SERVER_IP} $envvars->{SERVER}"); + system("$nmblookup $envvars->{CONFIGURATION} $envvars->{SERVER}"); # make sure smbd is also up set print "wait for smbd\n"; |