Mercurial > hg-stable
changeset 17087:a79776f427b4
tests: make histedit pass on Windows MSYS
The command file will now be named with $TESTTMP (with '\') instead of `pwd`
(with '/') to avoid wrong path conversions.
| author | Mads Kiilerich <mads@kiilerich.com> |
|---|---|
| date | Mon, 02 Jul 2012 01:47:59 +0200 |
| parents | 5f2cacb715dc |
| children | 31f7dd50ed40 |
| files | tests/test-histedit-bookmark-motion.t tests/test-histedit-commute.t tests/test-histedit-drop.t tests/test-histedit-edit.t tests/test-histedit-fold-non-commute.t tests/test-histedit-fold.t tests/test-histedit-non-commute-abort.t tests/test-histedit-non-commute.t tests/test-histedit-outgoing.t |
| diffstat | 9 files changed, 12 insertions(+), 12 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-histedit-bookmark-motion.t Sat Jun 30 03:34:50 2012 +0200 +++ b/tests/test-histedit-bookmark-motion.t Mon Jul 02 01:47:59 2012 +0200 @@ -95,8 +95,8 @@ histedit: moving bookmarks will-move-backwards histedit: e860deea161a to ae467701c500 histedit: moving bookmarks four - saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg - saved backup bundle to $TESTTMP/r/.hg/strip-backup/34a9919932c1-backup.hg + saved backup bundle to $TESTTMP/r/.hg/strip-backup/d2ae7f538514-backup.hg (glob) + saved backup bundle to $TESTTMP/r/.hg/strip-backup/34a9919932c1-backup.hg (glob) $ hg log --graph @ changeset: 3:0efacef7cb48 | bookmark: five @@ -152,7 +152,7 @@ histedit: 0efacef7cb48 to 7c044e3e33a9 histedit: ae467701c500 to 1be9c35b4cb2 histedit: moving bookmarks four, three - saved backup bundle to $TESTTMP/r/.hg/strip-backup/ae467701c500-backup.hg + saved backup bundle to $TESTTMP/r/.hg/strip-backup/ae467701c500-backup.hg (glob) We expect 'five' to stay at tip, since the tipmost bookmark is most likely the useful signal.
--- a/tests/test-histedit-commute.t Sat Jun 30 03:34:50 2012 +0200 +++ b/tests/test-histedit-commute.t Mon Jul 02 01:47:59 2012 +0200 @@ -6,7 +6,7 @@ > histedit= > EOF - $ EDITED=`pwd`/editedhistory + $ EDITED="$TESTTMP/editedhistory" $ cat > $EDITED <<EOF > pick 177f92b77385 c > pick e860deea161a e
--- a/tests/test-histedit-drop.t Sat Jun 30 03:34:50 2012 +0200 +++ b/tests/test-histedit-drop.t Mon Jul 02 01:47:59 2012 +0200 @@ -6,7 +6,7 @@ > histedit= > EOF - $ EDITED=`pwd`/editedhistory + $ EDITED="$TESTTMP/editedhistory" $ cat > $EDITED <<EOF > drop 177f92b77385 c > pick e860deea161a e
--- a/tests/test-histedit-edit.t Sat Jun 30 03:34:50 2012 +0200 +++ b/tests/test-histedit-edit.t Mon Jul 02 01:47:59 2012 +0200 @@ -6,7 +6,7 @@ > histedit= > EOF - $ EDITED=`pwd`/editedhistory + $ EDITED="$TESTTMP/editedhistory" $ cat > $EDITED <<EOF > pick 177f92b77385 c > pick 055a42cdd887 d @@ -70,7 +70,7 @@ $ hg ci -m 'wat' created new head $ echo a > e - $ HGEDITOR='echo "foobaz" > ' hg histedit --continue 2>&1 | fixbundle + $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle 0 files updated, 0 files merged, 0 files removed, 0 files unresolved 0 files updated, 0 files merged, 0 files removed, 0 files unresolved
--- a/tests/test-histedit-fold-non-commute.t Sat Jun 30 03:34:50 2012 +0200 +++ b/tests/test-histedit-fold-non-commute.t Mon Jul 02 01:47:59 2012 +0200 @@ -6,7 +6,7 @@ > histedit= > EOF - $ EDITED=`pwd`/editedhistory + $ EDITED="$TESTTMP/editedhistory" $ cat > $EDITED <<EOF > pick 177f92b77385 c > pick 055a42cdd887 d
--- a/tests/test-histedit-fold.t Sat Jun 30 03:34:50 2012 +0200 +++ b/tests/test-histedit-fold.t Mon Jul 02 01:47:59 2012 +0200 @@ -6,7 +6,7 @@ > histedit= > EOF - $ EDITED=`pwd`/editedhistory + $ EDITED="$TESTTMP/editedhistory" $ cat > $EDITED <<EOF > pick e860deea161a e > pick 652413bf663e f
--- a/tests/test-histedit-non-commute-abort.t Sat Jun 30 03:34:50 2012 +0200 +++ b/tests/test-histedit-non-commute-abort.t Mon Jul 02 01:47:59 2012 +0200 @@ -6,7 +6,7 @@ > histedit= > EOF - $ EDITED=`pwd`/editedhistory + $ EDITED="$TESTTMP/editedhistory" $ cat > $EDITED <<EOF > pick 177f92b77385 c > pick 055a42cdd887 d
--- a/tests/test-histedit-non-commute.t Sat Jun 30 03:34:50 2012 +0200 +++ b/tests/test-histedit-non-commute.t Mon Jul 02 01:47:59 2012 +0200 @@ -6,7 +6,7 @@ > histedit= > EOF - $ EDITED=`pwd`/editedhistory + $ EDITED="$TESTTMP/editedhistory" $ cat > $EDITED <<EOF > pick 177f92b77385 c > pick 055a42cdd887 d
--- a/tests/test-histedit-outgoing.t Sat Jun 30 03:34:50 2012 +0200 +++ b/tests/test-histedit-outgoing.t Mon Jul 02 01:47:59 2012 +0200 @@ -4,7 +4,7 @@ > histedit= > EOF - $ EDITED=`pwd`/editedhistory + $ EDITED="$TESTTMP/editedhistory" $ cat > $EDITED <<EOF > pick 177f92b77385 c > pick e860deea161a e