Patchwork sanity.bbclass: If the sanity tests fail, don't mark them as complete

login
mail settings
Submitter Richard Purdie
Date April 17, 2012, 11:19 a.m.
Message ID <1334661587.616.79.camel@ted>
Download mbox | patch
Permalink /patch/26043/
State Accepted
Commit b99acaa8aa06dcbca46c3f7048124d6f8d643a8b
Headers show

Comments

Richard Purdie - April 17, 2012, 11:19 a.m.
From adf7a93daf5b648972b8d059cba49f28a64efe82 Mon Sep 17 00:00:00 2001
From: Richard Purdie <richard.purdie@linuxfoundation.org>
Date: Tue, 17 Apr 2012 11:16:18 +0000
Subject: 

If the sanity tests fail, we still were writing out the stamp which means
they'd get skipped the next time we run bitbake. This is clearly wrong
and we should only write out the stamp file if the sanity tests complete
successfully.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
---

Patch

diff --git a/meta/classes/sanity.bbclass b/meta/classes/sanity.bbclass
index 1b941ac..4d4abd3 100644
--- a/meta/classes/sanity.bbclass
+++ b/meta/classes/sanity.bbclass
@@ -378,7 +378,7 @@  def check_sanity(e):
         if last_sstate_dir != sstate_dir:
             messages = messages + check_sanity_sstate_dir_change(sstate_dir, e.data)
 
-    if os.path.exists("conf"):
+    if os.path.exists("conf") and not messages:
         f = file(sanityverfile, 'w')
         f.write("SANITY_VERSION %s\n" % sanity_version) 
         f.write("TMPDIR %s\n" % tmpdir)