diff options
| author | Florian Pritz <bluewind@xinu.at> | 2020-01-17 15:26:09 +0100 |
|---|---|---|
| committer | Florian Pritz <bluewind@xinu.at> | 2020-01-17 15:26:09 +0100 |
| commit | 6c66430e9658616e118d10af9c9ab48858a04e67 (patch) | |
| tree | 2e83a411ed158f151df085c7f3836827753aecf7 /tests | |
| parent | 42f8840323a219d3eca59a7a2a388c3a28eeb8fb (diff) | |
| parent | fa146ccabdd0de746a7076f0630af550e43d9088 (diff) | |
| download | cgit-6c66430e9658616e118d10af9c9ab48858a04e67.tar.gz cgit-6c66430e9658616e118d10af9c9ab48858a04e67.tar.xz | |
Merge tag 'v1.2.2' into local
CGIT v1.2.2
Diffstat (limited to 'tests')
| -rwxr-xr-x | tests/t0001-validate-git-versions.sh | 2 | ||||
| -rwxr-xr-x | tests/t0109-gitconfig.sh | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/tests/t0001-validate-git-versions.sh b/tests/t0001-validate-git-versions.sh index a65b35e..3200f31 100755 --- a/tests/t0001-validate-git-versions.sh +++ b/tests/t0001-validate-git-versions.sh @@ -33,7 +33,7 @@ test_expect_success 'test submodule version matches Makefile' ' sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") && cd git && git describe --match "v[0-9]*" $sm_sha1 - ) | sed -e "s/^v//" >sm_version && + ) | sed -e "s/^v//" -e "s/-/./" >sm_version && test_cmp sm_version makefile_version fi ' diff --git a/tests/t0109-gitconfig.sh b/tests/t0109-gitconfig.sh index 3ba6684..8cee75c 100755 --- a/tests/t0109-gitconfig.sh +++ b/tests/t0109-gitconfig.sh @@ -9,6 +9,12 @@ test -n "$(which strace 2>/dev/null)" || { exit } +strace true 2>/dev/null || { + skip_all='Skipping access validation tests: strace not functional' + test_done + exit +} + test_no_home_access () { non_existent_path="/path/to/some/place/that/does/not/possibly/exist" while test -d "$non_existent_path"; do |