[backend] BSSched::Checker: allow myjobsdir to be undef

Used in the testcases
openSUSE · Jun 17, 2016 · 0e92f17 · 0e92f17
1 parent 985635f
commit 0e92f17
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/backend/BSSched/BuildJob.pm b/src/backend/BSSched/BuildJob.pm
@@ -763,13 +763,16 @@ sub create {
   my $prp = "$projid/$repoid";
   my $srcmd5 = $pdata->{'srcmd5'};
   my $job = jobname($prp, $packid);
+  my @otherjobs;
   my $myjobsdir = $gctx->{'myjobsdir'};
-  if (-s "$myjobsdir/$job-$srcmd5") {
-    add_crossmarker($gctx, $bconf->{'hostarch'}, "$job-$srcmd5") if $bconf->{'hostarch'};	# just in case...
-    return ('scheduled', "$job-$srcmd5");
+  if ($myjobsdir) {
+    if (-s "$myjobsdir/$job-$srcmd5") {
+      add_crossmarker($gctx, $bconf->{'hostarch'}, "$job-$srcmd5") if $bconf->{'hostarch'};	# just in case...
+      return ('scheduled', "$job-$srcmd5");
+    }
+    return ('scheduled', $job) if -s "$myjobsdir/$job";   # obsolete
+    @otherjobs = grep {/^\Q$job\E-[0-9a-f]{32}$/} ls($myjobsdir);
   }
-  return ('scheduled', $job) if -s "$myjobsdir/$job";   # obsolete
-  my @otherjobs = grep {/^\Q$job\E-[0-9a-f]{32}$/} ls($myjobsdir);
   $job = "$job-$srcmd5";
 
   # a new one. expand usedforbuild. write info file.

diff --git a/src/backend/BSSched/Checker.pm b/src/backend/BSSched/Checker.pm
@@ -751,7 +751,7 @@ sub checkpkgs {
       # hmm, this might be a bad idea...
       my $job = BSSched::BuildJob::jobname($prp, $packid)."-$pdata->{'srcmd5'}";
       my $myjobsdir = $gctx->{'myjobsdir'};
-      if (-s "$myjobsdir/$job") {
+      if ($myjobsdir && -s "$myjobsdir/$job") {
 	# print "      - $packid ($buildtype)\n";
 	# print "        already scheduled\n";
 	my $bconf = $ctx->{'conf'};

diff --git a/src/backend/t/0170-BSSched-BuildJob-Package.t b/src/backend/t/0170-BSSched-BuildJob-Package.t
@@ -22,7 +22,6 @@ my $gctx = {
   'arch' => 'i586',
   'reporoot' => "$BSConfig::bsdir/build",
   'obsname' => 'testobs',
-  'myjobsdir' => 'testdata/jobsdir_does_not_exist',
 };
 
 my $projpacksin = readxml('testdata/buildinfo/srcserver/getprojpack?withsrcmd5&withdeps&withrepos&withconfig&withremotemap&ignoredisable&project=openSUSE:13.2&repository=standard&arch=i586&package=screen', $BSXML::projpack);