[PATCH v2 16/24] dtoc: Use pathlib to find the test directory

Simon Glass sjg at chromium.org
Fri Feb 24 02:18:16 CET 2023


Update this so that the directory being used is declared at the top of
the file. Use pathlib as it seems to be more modern.

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

(no changes since v1)

 tools/dtoc/test_dtoc.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py
index 0f544f9f54a..597c93e8a87 100755
--- a/tools/dtoc/test_dtoc.py
+++ b/tools/dtoc/test_dtoc.py
@@ -13,6 +13,7 @@ import collections
 import copy
 import glob
 import os
+import pathlib
 import struct
 import unittest
 
@@ -28,7 +29,8 @@ from dtoc.src_scan import get_compat_name
 from u_boot_pylib import test_util
 from u_boot_pylib import tools
 
-OUR_PATH = os.path.dirname(os.path.realpath(__file__))
+DTOC_DIR = pathlib.Path(__file__).parent
+TEST_DATA_DIR = DTOC_DIR / 'test/'
 
 
 HEADER = '''/*
@@ -91,7 +93,7 @@ def get_dtb_file(dts_fname, capture_stderr=False):
     Returns:
         str: Filename of compiled file in output directory
     """
-    return fdt_util.EnsureCompiled(os.path.join(OUR_PATH, 'test', dts_fname),
+    return fdt_util.EnsureCompiled(str(TEST_DATA_DIR / dts_fname),
                                    capture_stderr=capture_stderr)
 
 
-- 
2.39.2.637.g21b0678d19-goog



More information about the U-Boot mailing list