From: Simon Glass <sjg@chromium.org>
Date: Tue, 25 Jul 2023 14:13:22 +0000 (-0600)
Subject: buildman: Specify the output directory in tests
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=ad1c9b26a86bdccf6a10e3369b1009cde2b04365;p=u-boot.git

buildman: Specify the output directory in tests

The default output directory is generally '../' in tests so we end up
trying to create '../.bm-work'. This does not work with azure, so update
these tests to use the temporary directory instead.

Signed-off-by: Simon Glass <sjg@chromium.org>
---

diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py
index 58a9bf33ab..3115700f07 100644
--- a/tools/buildman/func_test.py
+++ b/tools/buildman/func_test.py
@@ -588,7 +588,8 @@ Some images are invalid'''
     def testBranchWithSlash(self):
         """Test building a branch with a '/' in the name"""
         self._test_branch = '/__dev/__testbranch'
-        self._RunControl('-b', self._test_branch, clean_dir=False)
+        self._RunControl('-b', self._test_branch, '-o', self._output_dir,
+                         clean_dir=False)
         self.assertEqual(self._builder.count, self._total_builds)
         self.assertEqual(self._builder.fail, 0)
 
@@ -1028,37 +1029,39 @@ endif
 
     def test_exclude_one(self):
         """Test excluding a single board from an arch"""
-        self._RunControl('arm', '-x', 'board1')
+        self._RunControl('arm', '-x', 'board1', '-o', self._output_dir)
         self.assertEqual(['board0'],
                          [b.target for b in self._boards.get_selected()])
 
     def test_exclude_arch(self):
         """Test excluding an arch"""
-        self._RunControl('-x', 'arm')
+        self._RunControl('-x', 'arm', '-o', self._output_dir)
         self.assertEqual(['board2', 'board4'],
                          [b.target for b in self._boards.get_selected()])
 
     def test_exclude_comma(self):
         """Test excluding a comma-separated list of things"""
-        self._RunControl('-x', 'arm,powerpc')
+        self._RunControl('-x', 'arm,powerpc', '-o', self._output_dir)
         self.assertEqual(['board4'],
                          [b.target for b in self._boards.get_selected()])
 
     def test_exclude_list(self):
         """Test excluding a list of things"""
-        self._RunControl('-x', 'board2', '-x' 'board4')
+        self._RunControl('-x', 'board2', '-x' 'board4', '-o', self._output_dir)
         self.assertEqual(['board0', 'board1'],
                          [b.target for b in self._boards.get_selected()])
 
     def test_single_boards(self):
         """Test building single boards"""
-        self._RunControl('--boards', 'board1')
+        self._RunControl('--boards', 'board1', '-o', self._output_dir)
         self.assertEqual(1, self._builder.count)
 
-        self._RunControl('--boards', 'board1', '--boards', 'board2')
+        self._RunControl('--boards', 'board1', '--boards', 'board2',
+                         '-o', self._output_dir)
         self.assertEqual(2, self._builder.count)
 
-        self._RunControl('--boards', 'board1,board2', '--boards', 'board4')
+        self._RunControl('--boards', 'board1,board2', '--boards', 'board4',
+                         '-o', self._output_dir)
         self.assertEqual(3, self._builder.count)
 
     def test_print_arch(self):