Diff options
| author | Bryce Kwon <bryce@brycekwon.com> | |
|---|---|---|
| committer | Bryce Kwon <bryce@brycekwon.com> | |
| commit | ||
| parent | ||
| tree | ||
| download | ||
Reorganise the tree into vendor/ and custom/
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/Makefile | 2 | |
| -rwxr-xr-x | tests/setup.sh | 2 | |
| -rwxr-xr-x | tests/t0001-validate-git-versions.sh | 10 | |
| -rwxr-xr-x | tests/t0201-limits.sh | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/tests/Makefile b/tests/Makefile index a11aa74..e159487 100644 --- a/tests/Makefile +++ b/tests/Makefile @@ -1,4 +1,4 @@ -include ../libraries/git/config.mak.uname +include ../vendor/git/config.mak.uname -include ../cgit.conf SHELL_PATH ?= $(SHELL) diff --git a/tests/setup.sh b/tests/setup.sh index a49a52b..39819e4 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -42,7 +42,7 @@ IFS=$LF set -- $test_argv IFS=$OLDIFS -: ${TEST_DIRECTORY=$(pwd)/../libraries/git/t} +: ${TEST_DIRECTORY=$(pwd)/../vendor/git/t} : ${TEST_OUTPUT_DIRECTORY=$(pwd)} TEST_NO_CREATE_REPO=YesPlease . "$TEST_DIRECTORY"/test-lib.sh diff --git a/tests/t0001-validate-git-versions.sh b/tests/t0001-validate-git-versions.sh index acc412d..65c3c6a 100755 --- a/tests/t0001-validate-git-versions.sh +++ b/tests/t0001-validate-git-versions.sh @@ -20,22 +20,22 @@ test_expect_success 'extract Git version from Makefile' ' # must apply the same transformation to the version in the Makefile before # comparing them. test_expect_success 'test Git version matches Makefile' ' - ( cat ../../libraries/git/GIT-VERSION-FILE || echo "No GIT-VERSION-FILE" ) | + ( cat ../../vendor/git/GIT-VERSION-FILE || echo "No GIT-VERSION-FILE" ) | sed -e "s/GIT_VERSION[ ]*=[ ]*//" -e "s/\\.dirty$//" >git_version && sed -e "s/-/./g" makefile_version >makefile_git_version && test_cmp git_version makefile_git_version ' test_expect_success 'test submodule version matches Makefile' ' - if ! test -e ../../libraries/git/.git + if ! test -e ../../vendor/git/.git then - echo "libraries/git/ is not a Git repository" >&2 + echo "vendor/git/ is not a Git repository" >&2 else ( cd ../.. && - sm_oid=$(git ls-files --stage -- libraries/git | + sm_oid=$(git ls-files --stage -- vendor/git | sed -e "s/^[0-9]* \\([0-9a-f]*\\) [0-9] .*$/\\1/") && - cd libraries/git && + cd vendor/git && git describe --match "v[0-9]*" $sm_oid ) | sed -e "s/^v//" -e "s/-/./" >sm_version && test_cmp sm_version makefile_version diff --git a/tests/t0201-limits.sh b/tests/t0201-limits.sh index 5f04952..a8dce62 100755 --- a/tests/t0201-limits.sh +++ b/tests/t0201-limits.sh @@ -131,7 +131,7 @@ test_expect_success LUA 'highlight filter passes text through without scintillua { echo "virtual-root=/" && echo "cache-size=0" && - echo "source-filter=lua:$(cd ../../extensions && pwd)/syntax-highlight.lua" && + echo "source-filter=lua:$(cd ../../custom/extensions && pwd)/syntax-highlight.lua" && echo "repo.url=limits" && echo "repo.path=$PWD/repos/limits/.git" } >hlrc && |