From: Simon Glass <sjg@chromium.org>
Date: Fri, 24 Feb 2023 01:18:16 +0000 (-0700)
Subject: dtoc: Use pathlib to find the test directory
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=1688d6ca0e0c665c909ec6cd30c2aa53445548f2;p=u-boot.git

dtoc: Use pathlib to find the test directory

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@chromium.org>
---

diff --git a/tools/dtoc/test_dtoc.py b/tools/dtoc/test_dtoc.py
index 0f544f9f54..597c93e8a8 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)