[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Bug-vc-dwim] 15 of 20 tests failed
|
From: |
Bruno Haible |
|
Subject: |
[Bug-vc-dwim] 15 of 20 tests failed |
|
Date: |
Sun, 2 Oct 2011 11:38:14 +0200 |
|
User-agent: |
KMail/1.13.6 (Linux/2.6.37.6-0.5-desktop; KDE/4.6.0; x86_64; ; ) |
Hi,
I'm trying to install vc-dwim 1.5 on a glibc 2.11 system (openSUSE Linux).
Using perl 5.12.3, git 1.6.3.2.
Configured with "./configure". "make". "make check" results:
====================================
15 of 20 tests failed
See tests/test-suite.log
Please report to address@hidden
====================================
Details attached below.
The cause is that I have an environment variable GIT_EXTERNAL_DIFF set.
If I unset this environment variable, all 20 tests pass.
Will it be reliable to use vc-dwim with GIT_EXTERNAL_DIFF set?
Or should I change the vc-dwim program to first unset this variable?
Bruno
=======================================
vc-dwim 1.5: tests/test-suite.log
=======================================
15 of 20 tests failed.
.. contents:: :depth: 2
FAIL: changelog-header-at-end-of-log (exit: 1)
==============================================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-changelog-header-at-end-of-log.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-changelog-header-at-end-of-log.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests
gt-changelog-header-at-end-of-log.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-changelog-header-at-end-of-log.WW7w
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-changelog-header-at-end-of-log.WW7w
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-changelog-header-at-end-of-log.WW7w
++++ tr S -
+++ perms='drwx------ 2 4096 Oct 2 10:58
/tmp/vc-dwim-1.5/tests/gt-changelog-header-at-end-of-log.WW7w'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-changelog-header-at-end-of-log.WW7w
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-changelog-header-at-end-of-log.WW7w
++ cd /tmp/vc-dwim-1.5/tests/gt-changelog-header-at-end-of-log.WW7w
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ header='2011-03-04 Joe Random <address@hidden>'
+ git init
+ printf '2011-03-04 Joe Random <address@hidden>\n\n\tfirst\n'
+ touch x
+ git add .
+ git commit -m m .
+ printf '2011-03-04 Joe Random <address@hidden>\n\n\t* x: y\n\n2011-03-04
Joe Random <address@hidden>\n\n\tfirst\n'
+ echo foo
+ vc-dwim --c
vc-dwim: ChangeLog contains no newly added lines
+ fail=1
+ grep '2011-03-04 Joe Random <address@hidden>' out
+ cat out
+ Exit 1
+ set +e
+ exit 1
+ exit 1
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-changelog-header-at-end-of-log.WW7w
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-changelog-header-at-end-of-log.WW7w
+ exit 1
FAIL: git-log-summary (exit: 255)
=================================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-git-log-summary.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-git-log-summary.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-git-log-summary.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-git-log-summary.4RXn
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-git-log-summary.4RXn
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-git-log-summary.4RXn
++++ tr S -
+++ perms='drwx------ 2 4096 Oct 2 10:58
/tmp/vc-dwim-1.5/tests/gt-git-log-summary.4RXn'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-git-log-summary.4RXn
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-git-log-summary.4RXn
++ cd /tmp/vc-dwim-1.5/tests/gt-git-log-summary.4RXn
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ cat
+ git init
+ git add .
+ git commit -m m .
+ touch x
+ git add x
+ cat
+ cat
+ set -e
+ fail=0
+ vc-dwim --commit
vc-dwim: ChangeLog contains no newly added lines
+ remove_tmp_
+ __st=255
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-git-log-summary.4RXn
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-git-log-summary.4RXn
+ exit 255
FAIL: author (exit: 255)
========================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-author.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-author.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-author.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-author.2QNP
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-author.2QNP
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-author.2QNP
++++ tr S -
+++ perms='drwx------ 2 4096 Oct 2 10:58 /tmp/vc-dwim-1.5/tests/gt-author.2QNP'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-author.2QNP
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-author.2QNP
++ cd /tmp/vc-dwim-1.5/tests/gt-author.2QNP
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ cat
+ git init
+ git add .
+ git commit -m m .
+ touch x
+ git add x
+ cat
+ set -e
+ fail=0
+ name_and_addr='joe blow <address@hidden>'
+ vc-dwim --commit '--author=joe blow <address@hidden>'
vc-dwim: ChangeLog contains no newly added lines
+ remove_tmp_
+ __st=255
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-author.2QNP
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-author.2QNP
+ exit 255
FAIL: subdir-middle (exit: 1)
=============================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-subdir-middle.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-subdir-middle.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-subdir-middle.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-subdir-middle.hkTh
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-subdir-middle.hkTh
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-subdir-middle.hkTh
++++ tr S -
+++ perms='drwx------ 2 4096 Oct 2 10:58
/tmp/vc-dwim-1.5/tests/gt-subdir-middle.hkTh'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-subdir-middle.hkTh
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-subdir-middle.hkTh
++ cd /tmp/vc-dwim-1.5/tests/gt-subdir-middle.hkTh
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ ChangeLog=2/3/ChangeLog
+ mkdir -p 2/3
+ touch 2/3/f 2/3/ChangeLog
+ git init
+ git add .
+ git commit -m m .
+ cat
+ echo z
+ fail=0
+ cd 2
+ vc-dwim 3/ChangeLog
+ fail=1
+ cat
+ cmp out exp
out exp differ: char 1, line 1
+ fail=1
+ test 1 = 1
+ diff out exp
1c1,7
< vc-dwim: 3/ChangeLog contains no newly added lines
---
> * f: X.
> diff --git a/2/3/f b/2/3/f
> index e69de29..b680253 100644
> --- a/2/3/f
> +++ b/2/3/f
> @@ -0,0 +1 @@
> +z
+ Exit 1
+ set +e
+ exit 1
+ exit 1
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-subdir-middle.hkTh
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-subdir-middle.hkTh
+ exit 1
FAIL: add-empty (exit: 255)
===========================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-add-empty.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-add-empty.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-add-empty.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-add-empty.sHom
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-add-empty.sHom
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-add-empty.sHom
++++ tr S -
+++ perms='drwx------ 2 4096 Oct 2 10:58
/tmp/vc-dwim-1.5/tests/gt-add-empty.sHom'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-add-empty.sHom
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-add-empty.sHom
++ cd /tmp/vc-dwim-1.5/tests/gt-add-empty.sHom
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ cat
+ git init
+ echo foo
+ git add .
+ git commit -m m .
+ git mv x y
+ :
+ cat
+ cat
+ set -e
+ vc-dwim ChangeLog
vc-dwim: ChangeLog contains no newly added lines
+ remove_tmp_
+ __st=255
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-add-empty.sHom
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-add-empty.sHom
+ exit 255
FAIL: git-mv (exit: 255)
========================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-git-mv.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-git-mv.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-git-mv.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-git-mv.kLPK
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-git-mv.kLPK
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-git-mv.kLPK
++++ tr S -
+++ perms='drwx------ 2 4096 Oct 2 10:58 /tmp/vc-dwim-1.5/tests/gt-git-mv.kLPK'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-git-mv.kLPK
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-git-mv.kLPK
++ cd /tmp/vc-dwim-1.5/tests/gt-git-mv.kLPK
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ cat
+ git init
+ touch x
+ git add .
+ git commit -m m .
+ git mv x y
+ cat
+ cat
+ cat
+ set -e
+ vc-dwim ChangeLog
vc-dwim: ChangeLog contains no newly added lines
+ remove_tmp_
+ __st=255
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-git-mv.kLPK
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-git-mv.kLPK
+ exit 255
FAIL: two-line-attr (exit: 1)
=============================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-two-line-attr.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-two-line-attr.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-two-line-attr.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-two-line-attr.p1g6
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-two-line-attr.p1g6
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-two-line-attr.p1g6
++++ tr S -
+++ perms='drwx------ 2 4096 Oct 2 10:58
/tmp/vc-dwim-1.5/tests/gt-two-line-attr.p1g6'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-two-line-attr.p1g6
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-two-line-attr.p1g6
++ cd /tmp/vc-dwim-1.5/tests/gt-two-line-attr.p1g6
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ touch f ChangeLog
+ git init
+ git add .
+ git commit -m m .
+ fail=0
+ cat
+ echo bow
+ vc-dwim ChangeLog
vc-dwim: ChangeLog contains no newly added lines
+ fail=1
+ cat
+ cmp out exp
cmp: EOF on out
+ fail=1
+ test 1 = 1
+ diff out exp
0a1,7
> * f: X.
> diff --git a/f b/f
> index e69de29..de03f25 100644
> --- a/f
> +++ b/f
> @@ -0,0 +1 @@
> +bow
+ Exit 1
+ set +e
+ exit 1
+ exit 1
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-two-line-attr.p1g6
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-two-line-attr.p1g6
+ exit 1
FAIL: cl-other-user (exit: 1)
=============================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-cl-other-user.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-cl-other-user.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-cl-other-user.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-cl-other-user.rbxb
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-cl-other-user.rbxb
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-cl-other-user.rbxb
++++ tr S -
+++ perms='drwx------ 2 4096 Oct 2 10:58
/tmp/vc-dwim-1.5/tests/gt-cl-other-user.rbxb'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-cl-other-user.rbxb
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-cl-other-user.rbxb
++ cd /tmp/vc-dwim-1.5/tests/gt-cl-other-user.rbxb
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ touch f ChangeLog
+ git init
+ git add .
+ git commit -m m .
+ fail=0
+ cat
+ echo bow
+ vc-dwim ChangeLog
vc-dwim: ChangeLog contains no newly added lines
+ fail=1
+ cat
+ cmp out exp
cmp: EOF on out
+ fail=1
+ test 1 = 1
+ diff out exp
0a1,11
> Import this patch from libc:
>
> 2006-04-07 Someone Else <address@hidden>
>
> * f: whatever
> diff --git a/f b/f
> index e69de29..de03f25 100644
> --- a/f
> +++ b/f
> @@ -0,0 +1 @@
> +bow
+ Exit 1
+ set +e
+ exit 1
+ exit 1
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-cl-other-user.rbxb
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-cl-other-user.rbxb
+ exit 1
FAIL: symlinked-changelog (exit: 1)
===================================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-symlinked-changelog.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-symlinked-changelog.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-symlinked-changelog.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-symlinked-changelog.2Kgb
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-symlinked-changelog.2Kgb
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-symlinked-changelog.2Kgb
++++ tr S -
+++ perms='drwx------ 2 4096 Oct 2 10:58
/tmp/vc-dwim-1.5/tests/gt-symlinked-changelog.2Kgb'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-symlinked-changelog.2Kgb
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-symlinked-changelog.2Kgb
++ cd /tmp/vc-dwim-1.5/tests/gt-symlinked-changelog.2Kgb
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_bzr_
+ have_bzr=1
++ sed 1q
+ bzr_version='Bazaar (bzr) 1.17'
+ test 0 '!=' 0
+ case $bzr_version in
+ test 1 = 0
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ mkdir d m
+ touch m/f
+ cat
++ pwd
+ HOME=/tmp/vc-dwim-1.5/tests/gt-symlinked-changelog.2Kgb
+ export HOME
+ bzr whoami 'U. Ser <address@hidden>'
+ cd m
+ bzr init
[/ ] Build phase 0/2
[#########- ] Build phase:Apply phase 0/2
[#########\ ] Build phase:Apply phase:removing file 0/1
[##############| ] Build phase:Apply phase 1/2
Created a standalone tree (format: pack-0.92)
+ bzr add .
adding f
+ bzr ci -m m .
[###/ ] Collecting changes [0] - Stage 1/5
Committing to: /tmp/vc-dwim-1.5/tests/gt-symlinked-changelog.2Kgb/m/
added f
Committed revision 1.
+ ln -s ../d/ChangeLog m
+ echo a
+ cd d
+ git init
Initialized empty Git repository in
/tmp/vc-dwim-1.5/tests/gt-symlinked-changelog.2Kgb/d/.git/
+ git add .
+ git commit -m m .
[master (root-commit) aff1705] m
1 files changed, 2 insertions(+), 0 deletions(-)
create mode 100644 ChangeLog
+ cat
+ fail=0
+ cd m
+ vc-dwim ChangeLog
vc-dwim: ChangeLog contains no newly added lines
+ fail=1
+ cut -b1-7 out
+ mv k out
+ cat
+ cmp out exp
cmp: EOF on out
+ fail=1
+ test 1 = 1
+ diff out exp
0a1,7
> * f: X.
> === mod
> --- f 2
> +++ f 2
> @@ -0,0
> +a
>
+ cd m
+ vc-dwim --commit ChangeLog
vc-dwim: ChangeLog contains no newly added lines
+ fail=1
+ sed '/^f$/d'
+ mv k out
+ sed 's/^diff -r/diff --/' out
+ mv k out
+ cmp out exp
cmp: EOF on out
+ fail=1
+ test 1 = 1
+ diff out exp
0a1,7
> * f: X.
> === mod
> --- f 2
> +++ f 2
> @@ -0,0
> +a
>
+ Exit 1
+ set +e
+ exit 1
+ exit 1
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-symlinked-changelog.2Kgb
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-symlinked-changelog.2Kgb
+ exit 1
FAIL: scalar (exit: 1)
======================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-scalar.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-scalar.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-scalar.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-scalar.m0Ul
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-scalar.m0Ul
++++ tr S -
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-scalar.m0Ul
+++ perms='drwx------ 2 4096 Oct 2 10:58 /tmp/vc-dwim-1.5/tests/gt-scalar.m0Ul'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-scalar.m0Ul
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-scalar.m0Ul
++ cd /tmp/vc-dwim-1.5/tests/gt-scalar.m0Ul
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ touch f
+ git init
Initialized empty Git repository in /tmp/vc-dwim-1.5/tests/gt-scalar.m0Ul/.git/
+ git add .
+ git commit -m m .
[master (root-commit) 5a2098f] m
0 files changed, 0 insertions(+), 0 deletions(-)
create mode 100644 f
+ mkdir .git/c
+ cat
+ ln -s .git/c/ChangeLog .
+ cd .git/c
+ git init
Initialized empty Git repository in
/tmp/vc-dwim-1.5/tests/gt-scalar.m0Ul/.git/c/.git/
+ git add .
+ git commit -m m .
[master (root-commit) 70e9e46] m
1 files changed, 12 insertions(+), 0 deletions(-)
create mode 100644 ChangeLog
+ perl -pi -e '/X/ and print "\t* f: new\n";' -e '/Y/ and print "\tgah\n"'
.git/c/ChangeLog
+ echo
+ fail=0
+ vc-dwim --c
vc-dwim: ChangeLog contains no newly added lines
+ fail=1
+ git log -1 --pretty=format:%b
++ cat log
+ test '' = gah
+ fail=1
+ Exit 1
+ set +e
+ exit 1
+ exit 1
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-scalar.m0Ul
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-scalar.m0Ul
+ exit 1
FAIL: cl-but-no-diff (exit: 1)
==============================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-cl-but-no-diff.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-cl-but-no-diff.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-cl-but-no-diff.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-cl-but-no-diff.POIM
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-cl-but-no-diff.POIM
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-cl-but-no-diff.POIM
++++ tr S -
+++ perms='drwx------ 2 4096 Oct 2 10:58
/tmp/vc-dwim-1.5/tests/gt-cl-but-no-diff.POIM'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-cl-but-no-diff.POIM
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-cl-but-no-diff.POIM
++ cd /tmp/vc-dwim-1.5/tests/gt-cl-but-no-diff.POIM
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ cat
+ git init
+ git add .
+ git commit -m m .
+ set -e
+ cat
+ vc-dwim ChangeLog
+ cat
+ cmp out exp
out exp differ: char 10, line 1
+ diff out exp
1c1,2
< vc-dwim: ChangeLog contains no newly added lines
---
> vc-dwim: not-mod is listed in the ChangeLog entry, but not in diffs.
> Did you forget to add it?
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-cl-but-no-diff.POIM
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-cl-but-no-diff.POIM
+ exit 1
FAIL: leading-comment (exit: 1)
===============================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-leading-comment.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-leading-comment.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-leading-comment.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-leading-comment.EvRt
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-leading-comment.EvRt
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-leading-comment.EvRt
++++ tr S -
+++ perms='drwx------ 2 4096 Oct 2 10:58
/tmp/vc-dwim-1.5/tests/gt-leading-comment.EvRt'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-leading-comment.EvRt
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-leading-comment.EvRt
++ cd /tmp/vc-dwim-1.5/tests/gt-leading-comment.EvRt
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ touch f ChangeLog
+ git init
+ git add .
+ git commit -m m .
+ fail=0
+ cat
+ echo bow
+ vc-dwim ChangeLog
vc-dwim: ChangeLog contains no newly added lines
+ fail=1
+ cat
+ cmp out exp
cmp: EOF on out
+ fail=1
+ test 1 = 1
+ diff out exp
0a1,9
> Summary...
> * f: X.
> (dog): bark.
> diff --git a/f b/f
> index e69de29..de03f25 100644
> --- a/f
> +++ b/f
> @@ -0,0 +1 @@
> +bow
+ Exit 1
+ set +e
+ exit 1
+ exit 1
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-leading-comment.EvRt
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-leading-comment.EvRt
+ exit 1
FAIL: no-star (exit: 1)
=======================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-no-star.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-no-star.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-no-star.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-no-star.Sid7
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-no-star.Sid7
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-no-star.Sid7
++++ tr S -
+++ perms='drwx------ 2 4096 Oct 2 10:58
/tmp/vc-dwim-1.5/tests/gt-no-star.-id7'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-no-star.Sid7
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-no-star.Sid7
++ cd /tmp/vc-dwim-1.5/tests/gt-no-star.Sid7
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ touch f
+ cat
+ git init
+ git add .
+ git commit -m m .
+ fail=0
+ cat
+ echo bow
+ vc-dwim ChangeLog
vc-dwim: ChangeLog contains no newly added lines
+ fail=1
+ cat
+ cmp out exp
cmp: EOF on out
+ fail=1
+ test 1 = 1
+ diff out exp
0a1,7
> * f (dog): bark.
> diff --git a/f b/f
> index e69de29..de03f25 100644
> --- a/f
> +++ b/f
> @@ -0,0 +1 @@
> +bow
+ Exit 1
+ set +e
+ exit 1
+ exit 1
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-no-star.Sid7
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-no-star.Sid7
+ exit 1
FAIL: subdir (exit: 1)
======================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-subdir.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-subdir.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-subdir.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-subdir.1CQ3
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-subdir.1CQ3
++++ tr S -
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-subdir.1CQ3
+++ perms='drwx------ 2 4096 Oct 2 10:58 /tmp/vc-dwim-1.5/tests/gt-subdir.1CQ3'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-subdir.1CQ3
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-subdir.1CQ3
++ cd /tmp/vc-dwim-1.5/tests/gt-subdir.1CQ3
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-dwim
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-dwim --version
vc-dwim version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ mkdir s
+ touch s/f s/ChangeLog
+ git init
+ git add .
+ git commit -m m .
+ fail=0
+ cat
+ echo bow
+ cd s
+ vc-dwim ChangeLog
+ fail=1
+ cat
+ cmp out exp
out exp differ: char 1, line 1
+ fail=1
+ test 1 = 1
+ diff out exp
1c1,7
< vc-dwim: ChangeLog contains no newly added lines
---
> * f: X.
> diff --git a/s/f b/s/f
> index e69de29..de03f25 100644
> --- a/s/f
> +++ b/s/f
> @@ -0,0 +1 @@
> +bow
+ Exit 1
+ set +e
+ exit 1
+ exit 1
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-subdir.1CQ3
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-subdir.1CQ3
+ exit 1
FAIL: dirty-workdir (exit: 1)
=============================
++ initial_cwd_=/tmp/vc-dwim-1.5/tests
++ fail=0
+++ testdir_prefix_
+++ printf gt
++ pfx_=gt
+++ mktempd_ /tmp/vc-dwim-1.5/tests gt-dirty-workdir.XXXX
+++ case $# in
+++ destdir_=/tmp/vc-dwim-1.5/tests
+++ template_=gt-dirty-workdir.XXXX
+++ MAX_TRIES_=4
+++ case $destdir_ in
+++ case $template_ in
++++ unset TMPDIR
++++ mktemp -d -t -p /tmp/vc-dwim-1.5/tests gt-dirty-workdir.XXXX
+++ d=/tmp/vc-dwim-1.5/tests/gt-dirty-workdir.EL4K
+++ case $d in
+++ test -d /tmp/vc-dwim-1.5/tests/gt-dirty-workdir.EL4K
++++ ls -dgo /tmp/vc-dwim-1.5/tests/gt-dirty-workdir.EL4K
++++ tr S -
+++ perms='drwx------ 2 4096 Oct 2 10:58
/tmp/vc-dwim-1.5/tests/gt-dirty-workdir.EL4K'
+++ case $perms in
+++ test 0 = 0
+++ echo /tmp/vc-dwim-1.5/tests/gt-dirty-workdir.EL4K
+++ return
++ test_dir_=/tmp/vc-dwim-1.5/tests/gt-dirty-workdir.EL4K
++ cd /tmp/vc-dwim-1.5/tests/gt-dirty-workdir.EL4K
++ gl_init_sh_nl_='
'
++ IFS='
'
++ for sig_ in 1 2 3 13 15
+++ expr 1 + 128
++ eval 'trap '\''Exit 129'\'' 1'
+++ trap 'Exit 129' 1
++ for sig_ in 1 2 3 13 15
+++ expr 2 + 128
++ eval 'trap '\''Exit 130'\'' 2'
+++ trap 'Exit 130' 2
++ for sig_ in 1 2 3 13 15
+++ expr 3 + 128
++ eval 'trap '\''Exit 131'\'' 3'
+++ trap 'Exit 131' 3
++ for sig_ in 1 2 3 13 15
+++ expr 13 + 128
++ eval 'trap '\''Exit 141'\'' 13'
+++ trap 'Exit 141' 13
++ for sig_ in 1 2 3 13 15
+++ expr 15 + 128
++ eval 'trap '\''Exit 143'\'' 15'
+++ trap 'Exit 143' 15
++ trap remove_tmp_ 0
+ path_prepend_ ..
+ test 1 '!=' 0
+ path_dir_=..
+ case $path_dir_ in
++ cd /tmp/vc-dwim-1.5/tests/..
++ echo /tmp/vc-dwim-1.5
+ abs_path_dir_=/tmp/vc-dwim-1.5
+ case $abs_path_dir_ in
+
PATH=/tmp/vc-dwim-1.5:/tmp/vc-dwim-1.5/tests/..:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/arch/x86_64-linux/gnu/bin:/arch/x86-linux/gnu/bin:/home/bruno/bin:/usr/local/bin:/usr/bin:/bin:/usr/bin/X11:/usr/X11R6/bin:/usr/games:/usr/lib64/jvm/jre/bin
+ create_exe_shims_ /tmp/vc-dwim-1.5
+ case $EXEEXT in
+ return 0
+ shift
+ test 0 '!=' 0
+ export PATH
+ print_ver_ vc-chlog
+ test yes = yes
+ local i
+ for i in '$*'
+ env vc-chlog --version
vc-chlog version 1.5
+ require_git_
+ have_git=1
+ git_version='git version 1.6.3.2'
+ test 0 '!=' 0
+ case $git_version in
+ test 1 = 0
+ : diff
+ :
+ diff_u='diff -u'
+ fail=0
+ set -e
+ git init
Initialized empty Git repository in
/tmp/vc-dwim-1.5/tests/gt-dirty-workdir.EL4K/.git/
+ cat
+ git add file.c
+ git commit -m init
[master (root-commit) 726bef8] init
1 files changed, 4 insertions(+), 0 deletions(-)
create mode 100644 file.c
+ cat
+ git add file.c
+ cat
+ git diff --cached
+ run_vc_chlog diff --dirty-workdir
+ infile=diff
+ shift
+ vc-chlog --stdin --dirty-workdir
+ sed 1,2d
+ test yes '!=' yes
+ cat stdout
+ cat stderr
+ grep '(foo)' stdout
+ remove_tmp_
+ __st=1
+ cleanup_
+ :
+ cd /tmp/vc-dwim-1.5/tests
+ chmod -R u+rwx /tmp/vc-dwim-1.5/tests/gt-dirty-workdir.EL4K
+ rm -rf /tmp/vc-dwim-1.5/tests/gt-dirty-workdir.EL4K
+ exit 1
--
In memoriam Bartolomé Blanco Márquez
<http://en.wikipedia.org/wiki/Bartolome_Blanco_Marquez>
- [Bug-vc-dwim] 15 of 20 tests failed,
Bruno Haible <=