[PATCH] t1402-check-ref-format: skip tests of refs beginning with slash on Windows
From: Johannes Sixt <hidden>
Date: 2016-06-15 22:52:14
Subsystem:
the rest · Maintainer:
Linus Torvalds
From: Johannes Sixt <redacted> Bash on Windows converts program arguments that look like absolute POSIX paths to their Windows form, i.e., drive-letter-colon format. For this reason, those tests in t1402 that check refs that begin with a slash do not work as expected on Windows: valid_ref tests are doomed to fail, and invalid_ref tests fail for the wrong reason (that there is a colon rather than that they begin with a slash). Skip these tests. Signed-off-by: Johannes Sixt <redacted> --- Am 10/13/2011 9:58, schrieb mhagger@alum.mit.edu:
From: Michael Haggerty <redacted> This is the next installment of the reference changes that I have been working on. This batch includes a lot of tidying up in preparation for the real changes.
This patch is needed on top of mh/check-ref-format-3, or it could be inserted in front of this batch (which probably amounts to the same thing :-) -- Hannes t/t1402-check-ref-format.sh | 64 +++++++++++++++++++++--------------------- 1 files changed, 32 insertions(+), 32 deletions(-)
diff --git a/t/t1402-check-ref-format.sh b/t/t1402-check-ref-format.sh
index 710fcca..dba5e97 100755
--- a/t/t1402-check-ref-format.sh
+++ b/t/t1402-check-ref-format.sh@@ -5,38 +5,38 @@ test_description='Test git check-ref-format' . ./test-lib.sh valid_ref() { - if test "$#" = 1 - then - test_expect_success "ref name '$1' is valid" \ - "git check-ref-format '$1'" - else - test_expect_success "ref name '$1' is valid with options $2" \ + prereq= + case $1 in + [A-Z]*) + prereq=$1 + shift + esac + test_expect_success $prereq "ref name '$1' is valid${2:+ with options $2}" \ "git check-ref-format $2 '$1'" - fi } invalid_ref() { - if test "$#" = 1 - then - test_expect_success "ref name '$1' is invalid" \ - "test_must_fail git check-ref-format '$1'" - else - test_expect_success "ref name '$1' is invalid with options $2" \ + prereq= + case $1 in + [A-Z]*) + prereq=$1 + shift + esac + test_expect_success $prereq "ref name '$1' is invalid${2:+ with options $2}" \ "test_must_fail git check-ref-format $2 '$1'" - fi } invalid_ref '' -invalid_ref '/' -invalid_ref '/' --allow-onelevel -invalid_ref '/' --normalize -invalid_ref '/' '--allow-onelevel --normalize' +invalid_ref NOT_MINGW '/' +invalid_ref NOT_MINGW '/' --allow-onelevel +invalid_ref NOT_MINGW '/' --normalize +invalid_ref NOT_MINGW '/' '--allow-onelevel --normalize' valid_ref 'foo/bar/baz' valid_ref 'foo/bar/baz' --normalize invalid_ref 'refs///heads/foo' valid_ref 'refs///heads/foo' --normalize invalid_ref 'heads/foo/' -invalid_ref '/heads/foo' -valid_ref '/heads/foo' --normalize +invalid_ref NOT_MINGW '/heads/foo' +valid_ref NOT_MINGW '/heads/foo' --normalize invalid_ref '///heads/foo' valid_ref '///heads/foo' --normalize invalid_ref './foo'
@@ -115,14 +115,14 @@ invalid_ref "$ref" --refspec-pattern invalid_ref "$ref" '--refspec-pattern --allow-onelevel' ref='/foo' -invalid_ref "$ref" -invalid_ref "$ref" --allow-onelevel -invalid_ref "$ref" --refspec-pattern -invalid_ref "$ref" '--refspec-pattern --allow-onelevel' -invalid_ref "$ref" --normalize -valid_ref "$ref" '--allow-onelevel --normalize' -invalid_ref "$ref" '--refspec-pattern --normalize' -valid_ref "$ref" '--refspec-pattern --allow-onelevel --normalize' +invalid_ref NOT_MINGW "$ref" +invalid_ref NOT_MINGW "$ref" --allow-onelevel +invalid_ref NOT_MINGW "$ref" --refspec-pattern +invalid_ref NOT_MINGW "$ref" '--refspec-pattern --allow-onelevel' +invalid_ref NOT_MINGW "$ref" --normalize +valid_ref NOT_MINGW "$ref" '--allow-onelevel --normalize' +invalid_ref NOT_MINGW "$ref" '--refspec-pattern --normalize' +valid_ref NOT_MINGW "$ref" '--refspec-pattern --allow-onelevel --normalize' test_expect_success "check-ref-format --branch @{-1}" ' T=$(git write-tree) &&
@@ -155,21 +155,21 @@ test_expect_success 'check-ref-format --branch from subdir' ' ' valid_ref_normalized() { - test_expect_success "ref name '$1' simplifies to '$2'" " + test_expect_success $3 "ref name '$1' simplifies to '$2'" " refname=\$(git check-ref-format --normalize '$1') && test \"\$refname\" = '$2'" } invalid_ref_normalized() { - test_expect_success "check-ref-format --normalize rejects '$1'" " + test_expect_success $2 "check-ref-format --normalize rejects '$1'" " test_must_fail git check-ref-format --normalize '$1'" } valid_ref_normalized 'heads/foo' 'heads/foo' valid_ref_normalized 'refs///heads/foo' 'refs/heads/foo' -valid_ref_normalized '/heads/foo' 'heads/foo' +valid_ref_normalized '/heads/foo' 'heads/foo' NOT_MINGW valid_ref_normalized '///heads/foo' 'heads/foo' invalid_ref_normalized 'foo' -invalid_ref_normalized '/foo' +invalid_ref_normalized '/foo' NOT_MINGW invalid_ref_normalized 'heads/foo/../bar' invalid_ref_normalized 'heads/./foo' invalid_ref_normalized 'heads\foo'
--
"Atomic objects are neither active nor radioactive." --
Programming Languages -- C++, Final Committee Draft (Doc.N3092)