Index: stable/10/bin/sh/tests/expansion/Makefile =================================================================== --- stable/10/bin/sh/tests/expansion/Makefile (revision 287754) +++ stable/10/bin/sh/tests/expansion/Makefile (revision 287755) @@ -1,87 +1,91 @@ # $FreeBSD$ .include FILESDIR= ${TESTSBASE}/bin/sh/expansion KYUAFILE= no FILES= arith1.0 FILES+= arith2.0 FILES+= arith3.0 FILES+= arith4.0 FILES+= arith5.0 FILES+= arith6.0 FILES+= arith7.0 FILES+= arith8.0 FILES+= arith9.0 FILES+= arith10.0 FILES+= arith11.0 FILES+= arith12.0 FILES+= arith13.0 FILES+= assign1.0 FILES+= cmdsubst1.0 FILES+= cmdsubst2.0 FILES+= cmdsubst3.0 FILES+= cmdsubst4.0 FILES+= cmdsubst5.0 FILES+= cmdsubst6.0 FILES+= cmdsubst7.0 FILES+= cmdsubst8.0 FILES+= cmdsubst9.0 FILES+= cmdsubst10.0 FILES+= cmdsubst11.0 FILES+= cmdsubst12.0 FILES+= cmdsubst13.0 FILES+= cmdsubst14.0 FILES+= cmdsubst15.0 FILES+= cmdsubst16.0 FILES+= cmdsubst17.0 FILES+= export1.0 FILES+= export2.0 FILES+= export3.0 FILES+= heredoc1.0 FILES+= heredoc2.0 FILES+= ifs1.0 FILES+= ifs2.0 FILES+= ifs3.0 FILES+= ifs4.0 +FILES+= ifs5.0 +FILES+= ifs6.0 +FILES+= ifs7.0 FILES+= length1.0 FILES+= length2.0 FILES+= length3.0 FILES+= length4.0 FILES+= length5.0 FILES+= length6.0 FILES+= length7.0 FILES+= length8.0 FILES+= local1.0 FILES+= local2.0 FILES+= pathname1.0 FILES+= pathname2.0 FILES+= pathname3.0 FILES+= pathname4.0 +FILES+= pathname5.0 FILES+= plus-minus1.0 FILES+= plus-minus2.0 FILES+= plus-minus3.0 FILES+= plus-minus4.0 FILES+= plus-minus5.0 FILES+= plus-minus6.0 FILES+= plus-minus7.0 FILES+= plus-minus8.0 FILES+= question1.0 FILES+= readonly1.0 FILES+= redir1.0 FILES+= set-u1.0 FILES+= set-u2.0 FILES+= set-u3.0 FILES+= tilde1.0 FILES+= tilde2.0 FILES+= trim1.0 FILES+= trim2.0 FILES+= trim3.0 FILES+= trim4.0 FILES+= trim5.0 FILES+= trim6.0 FILES+= trim7.0 FILES+= trim8.0 .include Index: stable/10/bin/sh/tests/expansion/ifs5.0 =================================================================== --- stable/10/bin/sh/tests/expansion/ifs5.0 (nonexistent) +++ stable/10/bin/sh/tests/expansion/ifs5.0 (revision 287755) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +set -- $(echo a b c d) +[ "$#" = 4 ] Property changes on: stable/10/bin/sh/tests/expansion/ifs5.0 ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: stable/10/bin/sh/tests/expansion/ifs6.0 =================================================================== --- stable/10/bin/sh/tests/expansion/ifs6.0 (nonexistent) +++ stable/10/bin/sh/tests/expansion/ifs6.0 (revision 287755) @@ -0,0 +1,6 @@ +# $FreeBSD$ + +IFS=': ' +x=': :' +set -- $x +[ "$#|$1|$2|$3" = "2|||" ] Property changes on: stable/10/bin/sh/tests/expansion/ifs6.0 ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: stable/10/bin/sh/tests/expansion/ifs7.0 =================================================================== --- stable/10/bin/sh/tests/expansion/ifs7.0 (nonexistent) +++ stable/10/bin/sh/tests/expansion/ifs7.0 (revision 287755) @@ -0,0 +1,5 @@ +# $FreeBSD$ + +IFS=2 +set -- $((123)) +[ "$#|$1|$2|$3" = "2|1|3|" ] Property changes on: stable/10/bin/sh/tests/expansion/ifs7.0 ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: stable/10/bin/sh/tests/expansion/pathname5.0 =================================================================== --- stable/10/bin/sh/tests/expansion/pathname5.0 (nonexistent) +++ stable/10/bin/sh/tests/expansion/pathname5.0 (revision 287755) @@ -0,0 +1,3 @@ +# $FreeBSD$ + +[ `echo '/[e]tc'` = /etc ] Property changes on: stable/10/bin/sh/tests/expansion/pathname5.0 ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: stable/10/bin/sh/tests/parameters/Makefile =================================================================== --- stable/10/bin/sh/tests/parameters/Makefile (revision 287754) +++ stable/10/bin/sh/tests/parameters/Makefile (revision 287755) @@ -1,20 +1,21 @@ # $FreeBSD$ .include FILESDIR= ${TESTSBASE}/bin/sh/parameters KYUAFILE= no FILES= env1.0 FILES+= exitstatus1.0 FILES+= mail1.0 FILES+= mail2.0 FILES+= optind1.0 FILES+= optind2.0 FILES+= positional1.0 FILES+= positional2.0 +FILES+= positional3.0 FILES+= positional5.0 FILES+= pwd1.0 FILES+= pwd2.0 .include Index: stable/10/bin/sh/tests/parameters/positional3.0 =================================================================== --- stable/10/bin/sh/tests/parameters/positional3.0 (nonexistent) +++ stable/10/bin/sh/tests/parameters/positional3.0 (revision 287755) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +r=$(${SH} -c 'echo ${01:+yes}${010:+yes}' '' a '' '' '' '' '' '' '' '' b) +[ "$r" = yesyes ] Property changes on: stable/10/bin/sh/tests/parameters/positional3.0 ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: stable/10/bin/sh/tests/parser/Makefile =================================================================== --- stable/10/bin/sh/tests/parser/Makefile (revision 287754) +++ stable/10/bin/sh/tests/parser/Makefile (revision 287755) @@ -1,64 +1,68 @@ # $FreeBSD$ .include FILESDIR= ${TESTSBASE}/bin/sh/parser KYUAFILE= no FILES= alias1.0 FILES+= alias2.0 FILES+= alias3.0 FILES+= alias4.0 FILES+= alias5.0 FILES+= alias6.0 FILES+= alias7.0 FILES+= alias8.0 FILES+= alias9.0 FILES+= alias10.0 FILES+= alias11.0 FILES+= alias12.0 FILES+= alias13.0 FILES+= alias14.0 FILES+= alias15.0 alias15.0.stdout FILES+= and-pipe-not.0 FILES+= case1.0 FILES+= case2.0 FILES+= dollar-quote1.0 FILES+= dollar-quote2.0 FILES+= dollar-quote3.0 FILES+= dollar-quote4.0 FILES+= dollar-quote5.0 FILES+= dollar-quote6.0 FILES+= dollar-quote7.0 FILES+= dollar-quote8.0 FILES+= dollar-quote9.0 FILES+= dollar-quote10.0 FILES+= dollar-quote11.0 +FILES+= dollar-quote12.0 FILES+= empty-braces1.0 FILES+= empty-cmd1.0 FILES+= for1.0 FILES+= for2.0 FILES+= func1.0 FILES+= func2.0 FILES+= func3.0 FILES+= heredoc1.0 FILES+= heredoc2.0 FILES+= heredoc3.0 FILES+= heredoc4.0 FILES+= heredoc5.0 FILES+= heredoc6.0 FILES+= heredoc7.0 FILES+= heredoc8.0 FILES+= heredoc9.0 FILES+= heredoc10.0 FILES+= heredoc11.0 +FILES+= line-cont1.0 +FILES+= line-cont2.0 +FILES+= line-cont3.0 FILES+= no-space1.0 FILES+= no-space2.0 FILES+= only-redir1.0 FILES+= only-redir2.0 FILES+= only-redir3.0 FILES+= only-redir4.0 FILES+= pipe-not1.0 FILES+= var-assign1.0 .include Index: stable/10/bin/sh/tests/parser/dollar-quote12.0 =================================================================== --- stable/10/bin/sh/tests/parser/dollar-quote12.0 (nonexistent) +++ stable/10/bin/sh/tests/parser/dollar-quote12.0 (revision 287755) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +# \u without any digits at all remains invalid. +# Our choice is a parse error. + +v=$( (eval ": \$'\u'") 2>&1 >/dev/null) +[ $? -ne 0 ] && [ -n "$v" ] Property changes on: stable/10/bin/sh/tests/parser/dollar-quote12.0 ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: stable/10/bin/sh/tests/parser/line-cont1.0 =================================================================== --- stable/10/bin/sh/tests/parser/line-cont1.0 (nonexistent) +++ stable/10/bin/sh/tests/parser/line-cont1.0 (revision 287755) @@ -0,0 +1,16 @@ +# $FreeBSD$ + +i\ +f +t\ +r\ +u\ +e +t\ +h\ +e\ +n +: +\ +f\ +i Property changes on: stable/10/bin/sh/tests/parser/line-cont1.0 ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: stable/10/bin/sh/tests/parser/line-cont2.0 =================================================================== --- stable/10/bin/sh/tests/parser/line-cont2.0 (nonexistent) +++ stable/10/bin/sh/tests/parser/line-cont2.0 (revision 287755) @@ -0,0 +1,4 @@ +# $FreeBSD$ + +[ "a\ +b" = ab ] Property changes on: stable/10/bin/sh/tests/parser/line-cont2.0 ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: stable/10/bin/sh/tests/parser/line-cont3.0 =================================================================== --- stable/10/bin/sh/tests/parser/line-cont3.0 (nonexistent) +++ stable/10/bin/sh/tests/parser/line-cont3.0 (revision 287755) @@ -0,0 +1,7 @@ +# $FreeBSD$ + +v=`printf %s 'a\ +b'` +w="`printf %s 'c\ +d'`" +[ "$v$w" = abcd ] Property changes on: stable/10/bin/sh/tests/parser/line-cont3.0 ___________________________________________________________________ Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Index: stable/10 =================================================================== --- stable/10 (revision 287754) +++ stable/10 (revision 287755) Property changes on: stable/10 ___________________________________________________________________ Modified: svn:mergeinfo ## -0,0 +0,1 ## Merged /head:r268436,273243,278806,280920,286971