Re: Tests in Cygwin

> Here is a change back to using spaces.  It also includes a change
> to test for the code working.  Squash on top.
>
> Signed-off-by: Don Slutz <Don.Slutz@SierraAtlantic.com>
> ---
> t/README                    |    4 ++--
> t/t0000-basic.sh            |   13 ++++++++++++-
> t/t1004-read-tree-m-u-wf.sh |    2 +-
> t/test-lib.sh               |    7 +------
> 4 files changed, 16 insertions(+), 10 deletions(-)
>
> diff --git a/t/README b/t/README
> index 49c3a51..c61e1d4 100644
> --- a/t/README
> +++ b/t/README
> @@ -200,9 +200,9 @@ library for your script to use.
>    <script>.  If it yields success, test is considered
>    successful.  <message> should state what it is testing.
>
> -   An optional parameter <prereq> is a '+' separated list of 
> prerequisite
> +   An optional parameter <prereq> is a space separated list of 
> prerequisite
>    tokens.  The test will be skipped if the test environment lacks any of
> -   the prerequiste feature listed (see below for commonly used
> +   the prerequisite feature listed (see below for commonly used
>    prerequisites).
>
>    Example:
> diff --git a/t/t0000-basic.sh b/t/t0000-basic.sh
> index f4ca4fc..58bac69 100755
> --- a/t/t0000-basic.sh
> +++ b/t/t0000-basic.sh
> @@ -67,7 +67,18 @@ donthaveit=yes
> test_expect_success DONTHAVEIT 'unmet prerequisite causes test to be 
> skipped' '
>     donthaveit=no
> '
> -if test $haveit$donthaveit != yesyes
> +test_set_prereq HAVEBOTH
> +haveboth1=no
> +test_expect_success 'HAVEBOTH HAVEIT' 'test runs if both 
> prerequisites are satisfied' '
> +    test_have_prereq "HAVEIT HAVEBOTH" &&
> +    haveboth1=yes
> +'
> +haveboth2=no
> +test_expect_success 'HAVEIT HAVEBOTH' 'test passes if both 
> prerequisites are satisfied' '
> +    test_have_prereq "HAVEBOTH HAVEIT" &&
> +    haveboth2=yes
> +'
> +if test $haveit$donthaveit$haveboth1$haveboth2 != yesyesyesyes
> then
>        say "bug in test framework: prerequisite tags do not work 
> reliably"
>        exit 1
> diff --git a/t/t1004-read-tree-m-u-wf.sh b/t/t1004-read-tree-m-u-wf.sh
> index 8683189..eb60f80 100755
> --- a/t/t1004-read-tree-m-u-wf.sh
> +++ b/t/t1004-read-tree-m-u-wf.sh
> @@ -177,7 +177,7 @@ test_expect_success SYMLINKS 'funny symlink in 
> work tree' '
>
> '
>
> -test_expect_success SYMLINKS+SANITY 'funny symlink in work tree, 
> un-unlink-able' '
> +test_expect_success 'SYMLINKS SANITY' 'funny symlink in work tree, 
> un-unlink-able' '
>
>        rm -fr a b &&
>        git reset --hard &&
> diff --git a/t/test-lib.sh b/t/test-lib.sh
> index 2d12799..dd3b8d7 100644
> --- a/t/test-lib.sh
> +++ b/t/test-lib.sh
> @@ -263,13 +263,8 @@ test_set_prereq () {
> }
> satisfied=" "
>
> -# prerequisites can be concatenated with '+'
> test_have_prereq () {
> -       save_IFS=$IFS
> -       IFS=+
> -       set -- $*
> -       IFS=$save_IFS
> -       for prerequisite
> +       for prerequisite in $(echo $*)
>        do
>                case $satisfied in
>                *" $prerequisite "*)