##// END OF EJS Templates
test suite: fix timezone problems and port collision problem...
mpm@selenic.com -
r382:37249c52 default
parent child Browse files
Show More
@@ -1,60 +1,61 b''
1 #!/bin/bash
1 #!/bin/bash
2
2
3 set -e
3 set -e
4
4
5 tests=0
5 tests=0
6 failed=0
6 failed=0
7 H=$PWD
7 H=$PWD
8
8
9 function run_one
9 function run_one
10 {
10 {
11 export TZ=GMT
11 D=`mktemp -d`
12 D=`mktemp -d`
12 if [ "$D" == "" ] ; then
13 if [ "$D" == "" ] ; then
13 echo mktemp failed!
14 echo mktemp failed!
14 fi
15 fi
15
16
16 cd $D
17 cd $D
17 fail=0
18 fail=0
18
19
19 if ! $H/$f > .out 2>&1 ; then
20 if ! $H/$f > .out 2>&1 ; then
20 echo $f failed with error code $?
21 echo $f failed with error code $?
21 fail=1
22 fail=1
22 fi
23 fi
23
24
24 if [ -s .out -a ! -r $H/$f.out ] ; then
25 if [ -s .out -a ! -r $H/$f.out ] ; then
25 echo $f generated unexpected output:
26 echo $f generated unexpected output:
26 cat .out
27 cat .out
27 cp .out $H/$f.err
28 cp .out $H/$f.err
28 fail=1
29 fail=1
29 elif [ -r $H/$f.out ] && ! diff -u $H/$f.out .out > /dev/null ; then
30 elif [ -r $H/$f.out ] && ! diff -u $H/$f.out .out > /dev/null ; then
30 echo $f output changed:
31 echo $f output changed:
31 diff -u $H/$f.out .out && true
32 diff -u $H/$f.out .out && true
32 cp .out $H/$f.err
33 cp .out $H/$f.err
33 fail=1
34 fail=1
34 fi
35 fi
35
36
36 cd $H
37 cd $H
37 rm -r $D
38 rm -r $D
38 return $fail
39 return $fail
39 }
40 }
40
41
41 TESTS=$@
42 TESTS=$@
42 if [ "$TESTS" == "" ] ; then
43 if [ "$TESTS" == "" ] ; then
43 TESTS=`ls test-* | grep -Ev "\.|~"`
44 TESTS=`ls test-* | grep -Ev "\.|~"`
44 fi
45 fi
45
46
46 for f in $TESTS ; do
47 for f in $TESTS ; do
47 echo -n "."
48 echo -n "."
48 if ! run_one $f ; then
49 if ! run_one $f ; then
49 failed=$[$failed + 1]
50 failed=$[$failed + 1]
50 fi
51 fi
51 tests=$[$tests + 1]
52 tests=$[$tests + 1]
52 done
53 done
53
54
54 echo
55 echo
55 echo Ran $tests tests, $failed failed
56 echo Ran $tests tests, $failed failed
56
57
57 if [ $failed -gt 0 ] ; then
58 if [ $failed -gt 0 ] ; then
58 exit 1
59 exit 1
59 fi
60 fi
60
61
@@ -1,22 +1,22 b''
1 + mkdir t
1 + mkdir t
2 + cd t
2 + cd t
3 + hg init
3 + hg init
4 + echo a
4 + echo a
5 + hg add a
5 + hg add a
6 + hg commit -t test -u test -d '0 0'
6 + hg commit -t test -u test -d '0 0'
7 + hg history
7 + hg history
8 changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
8 changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
9 user: test
9 user: test
10 date: Wed Dec 31 16:00:00 1969
10 date: Thu Jan 1 00:00:00 1970
11 summary: test
11 summary: test
12
12
13 + hg manifest
13 + hg manifest
14 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
14 b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3 644 a
15 + hg cat a
15 + hg cat a
16 a
16 a
17 + hg verify
17 + hg verify
18 checking changesets
18 checking changesets
19 checking manifests
19 checking manifests
20 crosschecking files in changesets and manifests
20 crosschecking files in changesets and manifests
21 checking files
21 checking files
22 1 files, 1 changesets, 1 total revisions
22 1 files, 1 changesets, 1 total revisions
@@ -1,51 +1,51 b''
1 + hg init
1 + hg init
2 + echo a
2 + echo a
3 + hg add a
3 + hg add a
4 + hg commit -t 1 -u test -d '0 0'
4 + hg commit -t 1 -u test -d '0 0'
5 + hg status
5 + hg status
6 ? .out
6 ? .out
7 + cp a b
7 + cp a b
8 + hg copy a b
8 + hg copy a b
9 + hg status
9 + hg status
10 A b
10 A b
11 ? .out
11 ? .out
12 + hg -d commit -t 2 -u test -d '0 0'
12 + hg -d commit -t 2 -u test -d '0 0'
13 b
13 b
14 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
14 b: copy a:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
15 + hg history
15 + hg history
16 changeset: 1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8
16 changeset: 1:3b5b84850bbed12e8ff8c1b87b32dc93c59ae6d8
17 user: test
17 user: test
18 date: Wed Dec 31 16:00:00 1969
18 date: Thu Jan 1 00:00:00 1970
19 summary: 2
19 summary: 2
20
20
21 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
21 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
22 user: test
22 user: test
23 date: Wed Dec 31 16:00:00 1969
23 date: Thu Jan 1 00:00:00 1970
24 summary: 1
24 summary: 1
25
25
26 + hg log a
26 + hg log a
27 revision: 0:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
27 revision: 0:b789fdd96dc2f3bd229c1dd8eedf0fc60e2b68e3
28 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
28 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
29 user: test
29 user: test
30 date: Wed Dec 31 16:00:00 1969
30 date: Thu Jan 1 00:00:00 1970
31 summary: 1
31 summary: 1
32
32
33 + hexdump -C .hg/data/b.d
33 + hexdump -C .hg/data/b.d
34 00000000 75 01 0a 63 6f 70 79 72 65 76 3a 20 62 37 38 39 |u..copyrev: b789|
34 00000000 75 01 0a 63 6f 70 79 72 65 76 3a 20 62 37 38 39 |u..copyrev: b789|
35 00000010 66 64 64 39 36 64 63 32 66 33 62 64 32 32 39 63 |fdd96dc2f3bd229c|
35 00000010 66 64 64 39 36 64 63 32 66 33 62 64 32 32 39 63 |fdd96dc2f3bd229c|
36 00000020 31 64 64 38 65 65 64 66 30 66 63 36 30 65 32 62 |1dd8eedf0fc60e2b|
36 00000020 31 64 64 38 65 65 64 66 30 66 63 36 30 65 32 62 |1dd8eedf0fc60e2b|
37 00000030 36 38 65 33 0a 63 6f 70 79 3a 20 61 0a 01 0a 61 |68e3.copy: a...a|
37 00000030 36 38 65 33 0a 63 6f 70 79 3a 20 61 0a 01 0a 61 |68e3.copy: a...a|
38 00000040 0a |.|
38 00000040 0a |.|
39 00000041
39 00000041
40 + hg cat b
40 + hg cat b
41 + md5sum
41 + md5sum
42 60b725f10c9c85c70d97880dfe8191b3 -
42 60b725f10c9c85c70d97880dfe8191b3 -
43 + hg cat a
43 + hg cat a
44 + md5sum
44 + md5sum
45 60b725f10c9c85c70d97880dfe8191b3 -
45 60b725f10c9c85c70d97880dfe8191b3 -
46 + hg verify
46 + hg verify
47 checking changesets
47 checking changesets
48 checking manifests
48 checking manifests
49 crosschecking files in changesets and manifests
49 crosschecking files in changesets and manifests
50 checking files
50 checking files
51 2 files, 2 changesets, 2 total revisions
51 2 files, 2 changesets, 2 total revisions
@@ -1,24 +1,24 b''
1 #!/bin/bash
1 #!/bin/bash
2
2
3 set -e
3 set -e
4
4
5 mkdir test
5 mkdir test
6 cd test
6 cd test
7 echo foo>foo
7 echo foo>foo
8 hg init
8 hg init
9 hg addremove
9 hg addremove
10 hg commit -t "1"
10 hg commit -t "1"
11 hg verify
11 hg verify
12 hg serve 2>/dev/null &
12 hg serve -p 20059 2>/dev/null &
13 C=$!
13 C=$!
14 cd ..
14 cd ..
15
15
16 mkdir copy
16 mkdir copy
17 cd copy
17 cd copy
18 hg init http://localhost:8000/
18 hg init http://localhost:20059/
19 hg verify
19 hg verify
20 hg co
20 hg co
21 cat foo
21 cat foo
22 hg manifest
22 hg manifest
23
23
24 kill $C
24 kill $C
@@ -1,30 +1,30 b''
1 + mkdir t
1 + mkdir t
2 + cd t
2 + cd t
3 + hg init
3 + hg init
4 + echo a
4 + echo a
5 + hg add a
5 + hg add a
6 + hg commit -t test -u test -d '0 0'
6 + hg commit -t test -u test -d '0 0'
7 + hg verify
7 + hg verify
8 checking changesets
8 checking changesets
9 checking manifests
9 checking manifests
10 crosschecking files in changesets and manifests
10 crosschecking files in changesets and manifests
11 checking files
11 checking files
12 1 files, 1 changesets, 1 total revisions
12 1 files, 1 changesets, 1 total revisions
13 + hg parents
13 + hg parents
14 changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
14 changeset: 0:acb14030fe0a21b60322c440ad2d20cf7685a376
15 user: test
15 user: test
16 date: Wed Dec 31 16:00:00 1969
16 date: Thu Jan 1 00:00:00 1970
17 summary: test
17 summary: test
18
18
19 + hg status
19 + hg status
20 + hg undo
20 + hg undo
21 attempting to rollback last transaction
21 attempting to rollback last transaction
22 + hg verify
22 + hg verify
23 checking changesets
23 checking changesets
24 checking manifests
24 checking manifests
25 crosschecking files in changesets and manifests
25 crosschecking files in changesets and manifests
26 checking files
26 checking files
27 0 files, 0 changesets, 0 total revisions
27 0 files, 0 changesets, 0 total revisions
28 + hg parents
28 + hg parents
29 + hg status
29 + hg status
30 A a
30 A a
@@ -1,70 +1,70 b''
1 + mkdir r1
1 + mkdir r1
2 + cd r1
2 + cd r1
3 + hg init
3 + hg init
4 + echo a
4 + echo a
5 + hg addremove
5 + hg addremove
6 + hg commit -t 1 -u test -d '0 0'
6 + hg commit -t 1 -u test -d '0 0'
7 + cd ..
7 + cd ..
8 + mkdir r2
8 + mkdir r2
9 + cd r2
9 + cd r2
10 + hg init ../r1
10 + hg init ../r1
11 + hg up
11 + hg up
12 + echo abc
12 + echo abc
13 + hg diff
13 + hg diff
14 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
14 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
15 --- a/a
15 --- a/a
16 +++ b/a
16 +++ b/a
17 @@ -1,1 +1,1 @@
17 @@ -1,1 +1,1 @@
18 -a
18 -a
19 +abc
19 +abc
20 + cd ../r1
20 + cd ../r1
21 + echo b
21 + echo b
22 + echo a2
22 + echo a2
23 + hg addremove
23 + hg addremove
24 + hg commit -t 2 -u test -d '0 0'
24 + hg commit -t 2 -u test -d '0 0'
25 + cd ../r2
25 + cd ../r2
26 + hg -q pull ../r1
26 + hg -q pull ../r1
27 + hg status
27 + hg status
28 C a
28 C a
29 + hg -d up
29 + hg -d up
30 resolving manifests
30 resolving manifests
31 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
31 ancestor a0c8bcbbb45c local a0c8bcbbb45c remote 1165e8bd193e
32 a versions differ, resolve
32 a versions differ, resolve
33 remote created b
33 remote created b
34 getting b
34 getting b
35 merging a
35 merging a
36 resolving a
36 resolving a
37 file a: other d730145abbf9 ancestor b789fdd96dc2
37 file a: other d730145abbf9 ancestor b789fdd96dc2
38 + hg -d up -m
38 + hg -d up -m
39 resolving manifests
39 resolving manifests
40 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
40 ancestor 1165e8bd193e local 1165e8bd193e remote 1165e8bd193e
41 + hg parents
41 + hg parents
42 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
42 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
43 user: test
43 user: test
44 date: Wed Dec 31 16:00:00 1969
44 date: Thu Jan 1 00:00:00 1970
45 summary: 2
45 summary: 2
46
46
47 + hg -v history
47 + hg -v history
48 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
48 changeset: 1:1e71731e6fbb5b35fae293120dea6964371c13c6
49 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
49 manifest: 1:1165e8bd193e17ad7d321d846fcf27ff3f412758
50 user: test
50 user: test
51 date: Wed Dec 31 16:00:00 1969
51 date: Thu Jan 1 00:00:00 1970
52 files: a b
52 files: a b
53 description:
53 description:
54 2
54 2
55
55
56 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
56 changeset: 0:c19d34741b0a4ced8e4ba74bb834597d5193851e
57 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
57 manifest: 0:a0c8bcbbb45c63b90b70ad007bf38961f64f2af0
58 user: test
58 user: test
59 date: Wed Dec 31 16:00:00 1969
59 date: Thu Jan 1 00:00:00 1970
60 files: a
60 files: a
61 description:
61 description:
62 1
62 1
63
63
64 + hg diff
64 + hg diff
65 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
65 + sed 's/\(\(---\|+++\).*\)\t.*/\1/'
66 --- a/a
66 --- a/a
67 +++ b/a
67 +++ b/a
68 @@ -1,1 +1,1 @@
68 @@ -1,1 +1,1 @@
69 -a2
69 -a2
70 +abc
70 +abc
General Comments 0
You need to be logged in to leave comments. Login now