s3:selftest: introduce a variable for binpath('nmblookup3') in tests.py
authorMichael Adam <obnox@samba.org>
Tue, 29 May 2012 10:10:16 +0000 (12:10 +0200)
committerMichael Adam <obnox@samba.org>
Thu, 31 May 2012 02:46:05 +0000 (04:46 +0200)
selftest/target/Samba3.pm

index d55c6d75b84052c21b19c3d1c910a701ae22d1c9..098f532094cae2b16136d7a3d1b1d8d4e4a9f45e 100755 (executable)
@@ -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";