git-1.6.2-rc2 problems on t4034-diff-words.sh

Hello,

I just download and started to test this on SCO OpenServer 6.0.mp4

They just released a new Maintianence Patch for the OS. This is what I get while running gmake test.

*** t4034-diff-words.sh ***
*   ok 1: setup
*   ok 2: word diff with runs of whitespace
*   ok 3: word diff with a regular expression
*   ok 4: set a diff driver
*   ok 5: option overrides .gitattributes
* FAIL 6: use regex supplied by driver

                 word_diff --color-words

*   ok 7: set diff.wordRegex option
*   ok 8: command-line overrides config
* FAIL 9: .gitattributes override config

                 word_diff --color-words

*   ok 10: remove diff driver regex
*   ok 11: use configured regex
* FAIL 12: test parsing words for newline

                 word_diff --color-words="a+"

* FAIL 13: test when words are only removed at the end

                 word_diff --color-words=.

* failed 4 among 13 test(s)
gmake[2]: *** [t4034-diff-words.sh] Error 1

Hi,

On Fri, 27 Feb 2009, Boyd Lynn Gerber wrote:

Oh wow.  SCO...

But as I did not forget your kind words, I'll try to help.

It might be a regex related issue.  Could you

- run the test with -i -v (and if that does not help, "sh -x t...")?

- try with "make COMPAT_FLAGS=-Icompat/regex COMPAT_OBJS=compat/regex/regex.o"?

Thanks, Dscho

Thanks for your assistence. I try to test each version before release. So I want to make sure no changes have broken things.

On Fri, 27 Feb 2009, Johannes Schindelin wrote:

Yes, I still have to support some SCO OS's. I use git on all my OS's. So I want to make sure it works on all of them.

Does the test suite use bash as it's shell? I seem to have to use bash now to run the test. I do not remember having to use bash on earlier 1.6.0

I have to use bash to run the test or I get

$ ./t4034-diff-words.sh ./t4034-diff-words.sh: syntax error at line 52: `(' unexpected

But if I run

$ bash ./t4034-diff-words.sh
*   ok 1: setup
*   ok 2: word diff with runs of whitespace
*   ok 3: word diff with a regular expression
*   ok 4: set a diff driver
*   ok 5: option overrides .gitattributes
* FAIL 6: use regex supplied by driver

                 word_diff --color-words

*   ok 7: set diff.wordRegex option
*   ok 8: command-line overrides config
* FAIL 9: .gitattributes override config

                 word_diff --color-words

*   ok 10: remove diff driver regex
*   ok 11: use configured regex
* FAIL 12: test parsing words for newline

                 word_diff --color-words="a+"

* FAIL 13: test when words are only removed at the end

                 word_diff --color-words=.

* failed 4 among 13 test(s)
$ bash ./t4034-diff-words.sh -i -v
Initialized empty Git repository in /tmp/git-1.6.2.rc2/t/trash 
directory.t4034-diff-words/.git/
* expecting success:

         git config diff.color.old red
         git config diff.color.new green

*   ok 1: setup

* expecting success:

         word_diff --color-words

*   ok 2: word diff with runs of whitespace

* expecting success:

         word_diff --color-words="[a-z]+"

*   ok 3: word diff with a regular expression

* expecting success:
         git config diff.testdriver.wordRegex "[^[:space:]]" &&
         cat <<EOF > .gitattributes
pre diff=testdriver
post diff=testdriver
EOF

*   ok 4: set a diff driver

* expecting success:

         word_diff --color-words="[a-z]+"

*   ok 5: option overrides .gitattributes

* expecting success:

         word_diff --color-words

Binary files expect and output.decrypted differ
* FAIL 6: use regex supplied by driver

                 word_diff --color-words

Binary files expect and output.decrypted differ
* FAIL 6: use regex supplied by driver

                 word_diff --color-words

$ gmake COMPAT_FLAGS=-Icompat/regex COMPAT_OBJS=compat/regex/regex.o
     CC compat/regex/regex.o
     AR libgit.a
     LINK git-fast-import
Undefined                       first referenced
symbol                              in file
git_fopen                           fast-import.o
git_vsnprintf                       fast-import.o
git_snprintf                        fast-import.o
UX:ld: ERROR: Symbol referencing errors. No output written to 
git-fast-import
gmake: *** [git-fast-import] Error 1

Hi,

On Fri, 27 Feb 2009, Boyd Lynn Gerber wrote:

No, bash should not be required.

Could you tell me what your version of t4034 has at line 52? Mine does not have a single parenthesis on that line.

Could you run it again after appending "-i -v" to the command line?

Ciao, Dscho

Boyd Lynn Gerber <gerberb@zenez.com> writes:

If your /bin/sh is not POSIX enough, you may be using a different shell when building the scripted commands in the main Makefile by setting SHELL_PATH. The tests are supposed to use the same one as that.

The open parenthesis on line 52 is the one between h and 4 here:

    cat > expect <<\EOF
    <WHITE>diff --git a/pre b/post<RESET>
    <WHITE>index 330b04f..5ed8eff 100644<RESET>
    <WHITE>--- a/pre<RESET>
    <WHITE>+++ b/post<RESET>
    <BROWN>@@ -1,3 +1,7 @@<RESET>
    <RED>h(4)<RESET><GREEN>h(4),hh[44]<RESET>
    <RESET>
    a = b + c<RESET>

    <GREEN>aa = a<RESET>

    <GREEN>aeff = aeff * ( aaa )<RESET>
    EOF

Perhaps your shell has a broken here-text?

On Fri, 27 Feb 2009, Junio C Hamano wrote:

On OpenServer 6.0.6 /u95/bin/sh /u95/bin/ksh /u95/bin/bash are POSIX compliant shells. The /bin/ shells are the stand SCO has had finx XENIX. They use system 5v3. POSIX is System 5v4.

Thanks,

On Fri, 27 Feb 2009, Boyd Lynn Gerber wrote:

That should have been OpenServer 6.0 MP4.