]> _ Git - alire.git/commit
A couple of improvements on the handling of project files and paths (#463)
authorFabien Chouteau <Fabien-Chouteau@users.noreply.github.com>
Mon, 6 Jul 2020 13:41:13 +0000 (15:41 +0200)
committerGitHub <noreply@github.com>
Mon, 6 Jul 2020 13:41:13 +0000 (15:41 +0200)
commit229ea63b4eac6147996576bd6ea5ec98852b3062
tree20b79e9fd28d6c65042345e93d374aa88288db39
parent0cf68ee8ffc7f8be1c587e5c622203d5baddb09b
A couple of improvements on the handling of project files and paths (#463)

* Alire.Releases: fix basename in Project_Files()

* Alire.Releases.Project_Paths: Add empty path for gpr in the root dir of a crate

* Alire.{Root|Release}: remove trailing path separator in Roots.Project_Paths

Doing it here means that case "base_dir/<empty_path>" is also handled.
i.e. return "base_dir" instead of "base_dir/"

* Alire.Roots: Do not always add root dir of crates in Project_Paths

The root dir will be included when necessary, i.e. when there is a project file.

* testsuite/drivers/asserts.py: revert repr() on output compare

It was useful to detect \r\n vs \n but make the test failure very
difficult to analyze otherwise.

* GPR_PROJECT_PATH tests: fix Windows vs UNIX paths

* tests/auto-gpr-with/gpr_in_subdir: improve test explanation

* Alire.Roots: expect UNIX dir separators from crates
22 files changed:
src/alire/alire-releases.adb
src/alire/alire-roots.adb
testsuite/drivers/alr.py
testsuite/drivers/asserts.py
testsuite/drivers/helpers.py
testsuite/tests/auto-gpr-with/basic/my_index/index/ex/extern.toml [new file with mode: 0644]
testsuite/tests/auto-gpr-with/basic/my_index/index/index.toml [new file with mode: 0644]
testsuite/tests/auto-gpr-with/basic/my_index/index/li/libhello_nogprwith.toml [new file with mode: 0644]
testsuite/tests/auto-gpr-with/basic/test.py [new file with mode: 0644]
testsuite/tests/auto-gpr-with/basic/test.yaml [new file with mode: 0644]
testsuite/tests/auto-gpr-with/gpr_in_subdir/my_index/index/gp/gpr_in_subdir.toml [new file with mode: 0644]
testsuite/tests/auto-gpr-with/gpr_in_subdir/my_index/index/index.toml [new file with mode: 0644]
testsuite/tests/auto-gpr-with/gpr_in_subdir/test.py [new file with mode: 0644]
testsuite/tests/auto-gpr-with/gpr_in_subdir/test.yaml [new file with mode: 0644]
testsuite/tests/setenv/basic/test.py
testsuite/tests/setenv/linked-paths/test.py
testsuite/tests/setenv/with-external/test.py
testsuite/tests/workflows/auto-gpr-with/my_index/index/ex/extern.toml [deleted file]
testsuite/tests/workflows/auto-gpr-with/my_index/index/index.toml [deleted file]
testsuite/tests/workflows/auto-gpr-with/my_index/index/li/libhello_nogprwith.toml [deleted file]
testsuite/tests/workflows/auto-gpr-with/test.py [deleted file]
testsuite/tests/workflows/auto-gpr-with/test.yaml [deleted file]