feedc0de/platformio-core
1
0
Fork 0
forked from platformio/platformio-core
Code Pull Requests Activity

Revert back normalizing platformio.*_dir option

Browse Source
This commit is contained in:
Ivan Kravets
2023-12-09 13:18:03 +02:00
parent 1e2c37c190
commit 51bf17515e
2 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platformio/project/options.py
View File

@ -87,8 +87,7 @@ def validate_dir(path):
return path return path
if path.startswith("~"): if path.startswith("~"):
path = fs.expanduser(path) path = fs.expanduser(path)
return path return os.path.abspath(path)
# return os.path.abspath(path)
def get_default_core_dir(): def get_default_core_dir():

9
tests/project/test_config.py
View File

@ -354,7 +354,10 @@ def test_get_value(config):
"--help", "--help",
] ]
# test relative dir # test relative dir
assert config.get("platformio", "src_dir") == "source" assert config.get("platformio", "src_dir") == os.path.abspath(
os.path.join(os.getcwd(), "source")
)
# renamed option # renamed option
assert config.get("env:extra_1", "lib_install") == ["574"] assert config.get("env:extra_1", "lib_install") == ["574"]
assert config.get("env:extra_1", "lib_deps") == ["574"] assert config.get("env:extra_1", "lib_deps") == ["574"]
@ -651,7 +654,7 @@ def test_nested_interpolation(tmp_path: Path):
""" """
[platformio] [platformio]
build_dir = /tmp/pio-$PROJECT_HASH build_dir = /tmp/pio-$PROJECT_HASH
data_dir = $PROJECT_DIR/assets data_dir = /$PROJECT_DIR/assets
[env:myenv] [env:myenv]
build_flags = -D UTIME=${UNIX_TIME} build_flags = -D UTIME=${UNIX_TIME}
@ -665,7 +668,7 @@ test_testing_command =
""" """
) )
config = ProjectConfig(str(project_conf)) config = ProjectConfig(str(project_conf))
assert config.get("platformio", "data_dir") == "$PROJECT_DIR/assets" assert config.get("platformio", "data_dir") == "/$PROJECT_DIR/assets"
assert config.get("env:myenv", "build_flags")[0][-10:].isdigit() assert config.get("env:myenv", "build_flags")[0][-10:].isdigit()
testing_command = config.get("env:myenv", "test_testing_command") testing_command = config.get("env:myenv", "test_testing_command")
assert "$" not in " ".join(testing_command) assert "$" not in " ".join(testing_command)