diff options
| author | Simon Glass <sjg@chromium.org> | 2020-04-17 17:51:33 -0600 |
|---|---|---|
| committer | Simon Glass <sjg@chromium.org> | 2020-04-26 14:24:08 -0600 |
| commit | 166a98a426616aa3e9c35d94ea3aaf8e67994e33 (patch) | |
| tree | f1b89bf191fc562a32841f0516c28ea64d7e319b | |
| parent | 88daaef19f985b6ba2f9c0f62eed5378d6d40ebd (diff) | |
| download | u-boot-166a98a426616aa3e9c35d94ea3aaf8e67994e33.tar.gz | |
buildman: Use out-env for environment output
At present the environment used by U-Boot is written to the 'env'
directory. This is fine when the output directory is not the same as the
source directory, but when it is (as with -w) it conflicts with the source
directory of the same name.
Rename 'env' to 'out-env' to fix this.
Signed-off-by: Simon Glass <sjg@chromium.org>
| -rw-r--r-- | tools/buildman/builderthread.py | 2 | ||||
| -rw-r--r-- | tools/buildman/func_test.py | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/tools/buildman/builderthread.py b/tools/buildman/builderthread.py index fc6e1ab25d..063bbc0145 100644 --- a/tools/buildman/builderthread.py +++ b/tools/buildman/builderthread.py @@ -333,7 +333,7 @@ class BuilderThread(threading.Thread): # Write out the image and function size information and an objdump env = result.toolchain.MakeEnvironment(self.builder.full_path) - with open(os.path.join(build_dir, 'env'), 'w') as fd: + with open(os.path.join(build_dir, 'out-env'), 'w') as fd: for var in sorted(env.keys()): print('%s="%s"' % (var, env[var]), file=fd) lines = [] diff --git a/tools/buildman/func_test.py b/tools/buildman/func_test.py index 8d3325d66f..e11dc8f899 100644 --- a/tools/buildman/func_test.py +++ b/tools/buildman/func_test.py @@ -546,6 +546,13 @@ class TestFunctional(unittest.TestCase): self.assertEqual(self._builder.count, self._total_builds) self.assertEqual(self._builder.fail, 0) + def testEnvironment(self): + """Test that the done and environment files are written to out-env""" + self._RunControl('-o', self._output_dir) + board0_dir = os.path.join(self._output_dir, 'current', 'board0') + self.assertTrue(os.path.exists(os.path.join(board0_dir, 'done'))) + self.assertTrue(os.path.exists(os.path.join(board0_dir, 'out-env'))) + def testWorkInOutput(self): """Test the -w option which should write directly to the output dir""" board_list = board.Boards() |