------------------------------------------------------------ revno: 11302 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: Jelmer Vernooij <[EMAIL PROTECTED]> branch nick: 4.0-perlselftest timestamp: Fri 2007-01-26 15:45:34 +0100 message: Generate recipe earlier, should make provisioning a bit faster. modified: source/script/tests/selftest.pl svn-v2:[EMAIL PROTECTED] === modified file 'source/script/tests/selftest.pl' --- a/source/script/tests/selftest.pl 2007-01-26 14:31:24 +0000 +++ b/source/script/tests/selftest.pl 2007-01-26 14:45:34 +0000 @@ -314,7 +314,7 @@ --help this help page Paths: - --prefix=DIR prefix to run tests in [st] + --prefix=DIR prefix to run tests in [st] --srcdir=DIR source directory [.] --builddir=DIR output directory [.] @@ -482,21 +482,6 @@ open(DATA, ">$test_fifo"); -# give time for nbt server to register its names -print "delaying for nbt name registration\n"; -sleep(4); - -# This will return quickly when things are up, but be slow if we need to wait for (eg) SSL init -system("bin/nmblookup $ENV{CONFIGURATION} $ENV{SERVER}"); -system("bin/nmblookup $ENV{CONFIGURATION} -U $ENV{SERVER} $ENV{SERVER}"); -system("bin/nmblookup $ENV{CONFIGURATION} $ENV{SERVER}"); -system("bin/nmblookup $ENV{CONFIGURATION} -U $ENV{SERVER} $ENV{NETBIOSNAME}"); -system("bin/nmblookup $ENV{CONFIGURATION} $ENV{NETBIOSNAME}"); -system("bin/nmblookup $ENV{CONFIGURATION} -U $ENV{SERVER} $ENV{NETBIOSNAME}"); - -# start off with 0 failures -$ENV{failed} = 0; - my @todo = (); if ($opt_target eq "win") { @@ -522,6 +507,21 @@ close(IN) or die("Error creating recipe"); } +# give time for nbt server to register its names +print "delaying for nbt name registration\n"; +sleep(4); + +# This will return quickly when things are up, but be slow if we need to wait for (eg) SSL init +system("bin/nmblookup $ENV{CONFIGURATION} $ENV{SERVER}"); +system("bin/nmblookup $ENV{CONFIGURATION} -U $ENV{SERVER} $ENV{SERVER}"); +system("bin/nmblookup $ENV{CONFIGURATION} $ENV{SERVER}"); +system("bin/nmblookup $ENV{CONFIGURATION} -U $ENV{SERVER} $ENV{NETBIOSNAME}"); +system("bin/nmblookup $ENV{CONFIGURATION} $ENV{NETBIOSNAME}"); +system("bin/nmblookup $ENV{CONFIGURATION} -U $ENV{SERVER} $ENV{NETBIOSNAME}"); + +# start off with 0 failures +$ENV{failed} = 0; + my $suitestotal = $#todo + 1; my $i = 0; $| = 1;