Re: [PATCH v2 18/19] mingw: handle the missing POSIXPERM prereq in t9124

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

 



Hi Junio,

On Tue, 26 Jan 2016, Junio C Hamano wrote:

> Johannes Schindelin <johannes.schindelin@xxxxxx> writes:
> 
> > On Windows, the permission system works completely differently than
> > expected by some of the tests. So let's make sure that we do not test
> > POSIX functionality on Windows.
> >
> > This lets t9124-git-svn-dcommit-auto-props.sh pass in Git for Windows'
> > SDK.
> >
> > Signed-off-by: Johannes Schindelin <johannes.schindelin@xxxxxx>
> > ---
> >  t/t9124-git-svn-dcommit-auto-props.sh | 16 ++++++++++------
> >  1 file changed, 10 insertions(+), 6 deletions(-)
> >
> > diff --git a/t/t9124-git-svn-dcommit-auto-props.sh b/t/t9124-git-svn-dcommit-auto-props.sh
> > index aa841e1..2be0805 100755
> > --- a/t/t9124-git-svn-dcommit-auto-props.sh
> > +++ b/t/t9124-git-svn-dcommit-auto-props.sh
> > @@ -34,8 +34,7 @@ test_expect_success 'enable auto-props config' '
> >  '
> >  
> >  test_expect_success 'add files matching auto-props' '
> > -	echo "#!$SHELL_PATH" >exec1.sh &&
> > -	chmod +x exec1.sh &&
> > +	printf "" | write_script exec1.sh &&
> 
> That looks like a useless use of printf.  Why not
> 
> 	write_script exec1.sh </dev/null &&

Good point! I changed it, also in t9100.

> >  	echo "hello" >hello.txt &&
> >  	echo bar >bar &&
> >  	git add exec1.sh hello.txt bar &&
> > @@ -48,8 +47,7 @@ test_expect_success 'disable auto-props config' '
> >  '
> >  
> >  test_expect_success 'add files matching disabled auto-props' '
> > -	echo "#$SHELL_PATH" >exec2.sh &&
> > -	chmod +x exec2.sh &&
> > +	printf "" | write_script exec2.sh &&
> >  	echo "world" >world.txt &&
> >  	echo zot >zot &&
> >  	git add exec2.sh world.txt zot &&
> > @@ -65,7 +63,10 @@ test_expect_success 'check resulting svn repository' '
> >  	cd svnrepo &&
> >  
> >  	# Check properties from first commit.
> > -	test "x$(svn_cmd propget svn:executable exec1.sh)" = "x*" &&
> > +	if test_have_prereq POSIXPERM
> > +	then
> > +		test -z "$(svn_cmd propget svn:executable exec1.sh)"
> 
> Why this change?
> 
> 		test "x$(svn_cmd propget svn:executable exec1.sh)" = "x*" &&
> 
> means "propget command gives a literal string that consists of a
> single asterisk".

Oh wow... I blame it on lack of sleep. Would you believe that I totally
overlooked the asterisk, in both cases? Wow.

Sorry for the mess, cleaned it up locally and will resubmit as soon as the
tests passed on both Windows & Linux, and as soon as I figure out how to
change my charset to something else than unknown.

My apologies,
Dscho

P.S.: Would you believe that the reason the tests passed on Linux was that
I forgot to install Subversion? ;-)
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html



[Index of Archives]     [Linux Kernel Development]     [Gcc Help]     [IETF Annouce]     [DCCP]     [Netdev]     [Networking]     [Security]     [V4L]     [Bugtraq]     [Yosemite]     [MIPS Linux]     [ARM Linux]     [Linux Security]     [Linux RAID]     [Linux SCSI]     [Fedora Users]