Sfoglia il codice sorgente

testing/infra/builder: split configure() from build()

Some test cases don't use a full build as setup, so split the build()
method into configure() and build().
It allows a test case to perform configuration at the setup stage and
the build inside the test itself.

Call this new method just before build in the BRTest base class, to keep
the current behavior for existing test cases.

This change will be needed when adding a common class to test the git
download infra.

Signed-off-by: Ricardo Martincoski <ricardo.martincoski@datacom.ind.br>
Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
Ricardo Martincoski 7 anni fa
parent
commit
998300c5f5
2 ha cambiato i file con 4 aggiunte e 1 eliminazioni
  1. 1 0
      support/testing/infra/basetest.py
  2. 3 1
      support/testing/infra/builder.py

+ 1 - 0
support/testing/infra/basetest.py

@@ -58,6 +58,7 @@ class BRTest(unittest.TestCase):
 
 
         if not self.b.is_finished():
         if not self.b.is_finished():
             self.show_msg("Building")
             self.show_msg("Building")
+            self.b.configure()
             self.b.build()
             self.b.build()
             self.show_msg("Building done")
             self.show_msg("Building done")
 
 

+ 3 - 1
support/testing/infra/builder.py

@@ -12,7 +12,7 @@ class Builder(object):
         self.builddir = builddir
         self.builddir = builddir
         self.logfile = infra.open_log_file(builddir, "build", logtofile)
         self.logfile = infra.open_log_file(builddir, "build", logtofile)
 
 
-    def build(self):
+    def configure(self):
         if not os.path.isdir(self.builddir):
         if not os.path.isdir(self.builddir):
             os.makedirs(self.builddir)
             os.makedirs(self.builddir)
 
 
@@ -33,6 +33,8 @@ class Builder(object):
         if ret != 0:
         if ret != 0:
             raise SystemError("Cannot olddefconfig")
             raise SystemError("Cannot olddefconfig")
 
 
+    def build(self):
+        env = {"PATH": os.environ["PATH"]}
         cmd = ["make", "-C", self.builddir]
         cmd = ["make", "-C", self.builddir]
         ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile,
         ret = subprocess.call(cmd, stdout=self.logfile, stderr=self.logfile,
                               env=env)
                               env=env)