##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

tests: fix test-transaction-safety.t on Windows...
Matt Harbison -
r48094:b1ce93dc default
parent child Browse files
Show More
Show file before | Show file after | Hide comments
@@ -54,17 +54,15 b' synchronisation+output script:'
54 $ export HG_TEST_FILE_EXT_DONE
54 $ export HG_TEST_FILE_EXT_DONE
55 $ cat << EOF > script/external.sh
55 $ cat << EOF > script/external.sh
56 > #!/bin/sh
56 > #!/bin/sh
57 > $RUNTESTDIR/testlib/wait-on-file 5 $HG_TEST_FILE_EXT_UNLOCK $HG_TEST_FILE_EXT_WAITING
57 > "$RUNTESTDIR/testlib/wait-on-file" 5 "$HG_TEST_FILE_EXT_UNLOCK" "$HG_TEST_FILE_EXT_WAITING"
58 > hg log --rev 'tip' -T 'external: {rev} {desc}\n' > $TESTTMP/output/external.out
58 > hg log --rev 'tip' -T 'external: {rev} {desc}\n' > "$TESTTMP/output/external.out"
59 > touch $HG_TEST_FILE_EXT_DONE
59 > touch "$HG_TEST_FILE_EXT_DONE"
60 > EOF
60 > EOF
61 $ chmod +x script/external.sh
62 $ cat << EOF > script/internal.sh
61 $ cat << EOF > script/internal.sh
63 > #!/bin/sh
62 > #!/bin/sh
64 > hg log --rev 'tip' -T 'internal: {rev} {desc}\n' > $TESTTMP/output/internal.out
63 > hg log --rev 'tip' -T 'internal: {rev} {desc}\n' > "$TESTTMP/output/internal.out"
65 > $RUNTESTDIR/testlib/wait-on-file 5 $HG_TEST_FILE_EXT_DONE $HG_TEST_FILE_EXT_UNLOCK
64 > "$RUNTESTDIR/testlib/wait-on-file" 5 "$HG_TEST_FILE_EXT_DONE" "$HG_TEST_FILE_EXT_UNLOCK"
66 > EOF
65 > EOF
67 $ chmod +x script/internal.sh
68
66
69
67
70 Automated commands:
68 Automated commands:
@@ -74,7 +72,7 b' Automated commands:'
74 > rm -f $TESTTMP/output/*
72 > rm -f $TESTTMP/output/*
75 > hg log --rev 'tip' -T 'pre-commit: {rev} {desc}\n'
73 > hg log --rev 'tip' -T 'pre-commit: {rev} {desc}\n'
76 > echo x >> a
74 > echo x >> a
77 > $TESTTMP/script/external.sh & hg commit -m "$1"
75 > sh $TESTTMP/script/external.sh & hg commit -m "$1"
78 > cat $TESTTMP/output/external.out
76 > cat $TESTTMP/output/external.out
79 > cat $TESTTMP/output/internal.out
77 > cat $TESTTMP/output/internal.out
80 > hg log --rev 'tip' -T 'post-tr: {rev} {desc}\n'
78 > hg log --rev 'tip' -T 'post-tr: {rev} {desc}\n'
@@ -86,7 +84,7 b' Automated commands:'
86 > rm -f $TESTTMP/output/*
84 > rm -f $TESTTMP/output/*
87 > hg log --rev 'tip' -T 'pre-commit: {rev} {desc}\n'
85 > hg log --rev 'tip' -T 'pre-commit: {rev} {desc}\n'
88 > echo x >> a
86 > echo x >> a
89 > $TESTTMP/script/external.sh & hg pull ../other-repo/ --rev "$1" --force --quiet
87 > sh $TESTTMP/script/external.sh & hg pull ../other-repo/ --rev "$1" --force --quiet
90 > cat $TESTTMP/output/external.out
88 > cat $TESTTMP/output/external.out
91 > cat $TESTTMP/output/internal.out
89 > cat $TESTTMP/output/internal.out
92 > hg log --rev 'tip' -T 'post-tr: {rev} {desc}\n'
90 > hg log --rev 'tip' -T 'post-tr: {rev} {desc}\n'
@@ -122,7 +120,7 b' prepare a small extension to controll in'
122 > [extensions]
120 > [extensions]
123 > small_inline=$TESTTMP/ext/small_inline.py
121 > small_inline=$TESTTMP/ext/small_inline.py
124 > [hooks]
122 > [hooks]
125 > pretxnclose = $TESTTMP/script/internal.sh
123 > pretxnclose = sh $TESTTMP/script/internal.sh
126 > EOF
124 > EOF
127
125
128 check this is true for the initial commit (inline → inline)
126 check this is true for the initial commit (inline → inline)
General Comments 0
You need to be logged in to leave comments. Login now