From 3540731c987437dec05976b690f9971a9ff4ac08 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Thu, 15 Feb 2018 17:13:47 +0300 Subject: Shorten tag names for git repository tests (too long filenames on Windows) --- tests/common/git/README | 12 +++++++++++- tests/common/git/init | 8 ++++---- tests/common/git/state0/libbar.tar | Bin 61440 -> 61440 bytes tests/common/git/state0/libfoo.tar | Bin 256000 -> 256000 bytes tests/common/git/state0/style-basic.tar | Bin 61440 -> 61440 bytes tests/common/git/state0/style.tar | Bin 112640 -> 112640 bytes tests/common/git/state1/libbaz.tar | Bin 61440 -> 61440 bytes tests/common/git/state1/libfoo.tar | Bin 337920 -> 337920 bytes tests/common/git/state1/style-basic.tar | Bin 61440 -> 61440 bytes tests/common/git/state1/style.tar | Bin 112640 -> 112640 bytes tests/rep-fetch-git.test | 8 ++++---- 11 files changed, 19 insertions(+), 9 deletions(-) (limited to 'tests') diff --git a/tests/common/git/README b/tests/common/git/README index eac6765..737cd83 100644 --- a/tests/common/git/README +++ b/tests/common/git/README @@ -26,7 +26,7 @@ host. $ cd /var/scm -Create repositories, providing the proper project description: +Create repositories, providing proper project descriptions: # bpkg test repository with doc basic style library (initial state) # @@ -102,3 +102,13 @@ done $ for d in $(find . -type d -regex '\./testing/bpkg/advonly/.*/[^/]+\.git'); do \ git -C $d config uploadpack.allowAnySHA1InWant false \ done + +To publish changed local repositories run the following commands in the tests/ +subdirectory: + +$ b test config.test.output=keep +$ b ./publish + +Test the published repositories: + +$ b test config.bpkg.test.remote=true diff --git a/tests/common/git/init b/tests/common/git/init index c999347..691799e 100755 --- a/tests/common/git/init +++ b/tests/common/git/init @@ -104,8 +104,8 @@ git -C libfoo.git commit -am 'Create' # Add tags for libfoo.git. # -git -C libfoo.git tag 'lightweight_tag' -git -C libfoo.git tag -a 'annotated_tag' -m 'annotated_tag' +git -C libfoo.git tag 'ltag' +git -C libfoo.git tag -a 'atag' -m 'Create annotated tag' # Advance the master branch to make tags not to mark a branch tip. # @@ -163,8 +163,8 @@ git -C libfoo.git submodule add ../libbaz.git libbaz git -C libfoo.git submodule update --init libbaz git -C libfoo.git commit -am 'Add libbaz' -git -C libfoo.git tag -f 'lightweight_tag' -git -C libfoo.git tag -f -a 'annotated_tag' -m 'annotated_tag' +git -C libfoo.git tag -f 'ltag' +git -C libfoo.git tag -f -a 'atag' -m 'Move annotated tag' touch libfoo.git/INSTALL git -C libfoo.git add INSTALL diff --git a/tests/common/git/state0/libbar.tar b/tests/common/git/state0/libbar.tar index 4eff7d2..879f042 100644 Binary files a/tests/common/git/state0/libbar.tar and b/tests/common/git/state0/libbar.tar differ diff --git a/tests/common/git/state0/libfoo.tar b/tests/common/git/state0/libfoo.tar index 3938070..0533b6d 100644 Binary files a/tests/common/git/state0/libfoo.tar and b/tests/common/git/state0/libfoo.tar differ diff --git a/tests/common/git/state0/style-basic.tar b/tests/common/git/state0/style-basic.tar index aabbbcd..9d0ff47 100644 Binary files a/tests/common/git/state0/style-basic.tar and b/tests/common/git/state0/style-basic.tar differ diff --git a/tests/common/git/state0/style.tar b/tests/common/git/state0/style.tar index 1821210..d83c39f 100644 Binary files a/tests/common/git/state0/style.tar and b/tests/common/git/state0/style.tar differ diff --git a/tests/common/git/state1/libbaz.tar b/tests/common/git/state1/libbaz.tar index de6e3d9..c0cdb40 100644 Binary files a/tests/common/git/state1/libbaz.tar and b/tests/common/git/state1/libbaz.tar differ diff --git a/tests/common/git/state1/libfoo.tar b/tests/common/git/state1/libfoo.tar index ac5d10d..5708d07 100644 Binary files a/tests/common/git/state1/libfoo.tar and b/tests/common/git/state1/libfoo.tar differ diff --git a/tests/common/git/state1/style-basic.tar b/tests/common/git/state1/style-basic.tar index 94dc12b..71b5985 100644 Binary files a/tests/common/git/state1/style-basic.tar and b/tests/common/git/state1/style-basic.tar differ diff --git a/tests/common/git/state1/style.tar b/tests/common/git/state1/style.tar index 9e997ae..c939a87 100644 Binary files a/tests/common/git/state1/style.tar and b/tests/common/git/state1/style.tar differ diff --git a/tests/rep-fetch-git.test b/tests/rep-fetch-git.test index 1330d20..b3bf875 100644 --- a/tests/rep-fetch-git.test +++ b/tests/rep-fetch-git.test @@ -41,17 +41,17 @@ end .include rep-fetch-git-branch.test } -: lightweight-tag +: ltag : { - branch = 'lightweight_tag' + branch = 'ltag' .include rep-fetch-git-branch.test } -: annotated-tag +: atag : { - branch = 'annotated_tag' + branch = 'atag' .include rep-fetch-git-branch.test } -- cgit v1.1