Solaris fixes for a few tests
Giorgos Keramidas
keramida at ceid.upatras.gr
Thu Oct 19 13:21:58 UTC 2006
On 2006-10-19 03:46, Giorgos Keramidas <keramida at ceid.upatras.gr> wrote:
>On 2006-10-18 21:22, "Alexis S. L. Carvalho" <alexis at cecm.usp.br> wrote:
>>Thus spake Giorgos Keramidas:
>>> On 2006-10-18 16:03, Danek Duvall <danek.duvall at sun.com> wrote:
>>> > I can't speak for BSD, but on Solaris, /bin is simply a symlink to
>>> > /usr/bin, so /usr/bin/test would be fine. As would explicit -f/-d tests,
>>> > if Alexis is comfortable with that; I didn't want to change the semantics
>>> > that way without the original author's approval.
>>>
>>> I'd probably prefer -d/-f tests -- at least from a portability perspective.
>>> On FreeBSD (probably other BSD's too), /bin is not a symlink to /usr/bin.
>>
>> I've pushed a version with -d/-f to the crew repo.
>
> Thanks :)
>
> I can test on Linux, FreeBSD and Solaris 8/10, but it will have to wait
> a few hours, since it's far too late to do any merge work now.
Ok, here's the latest run of the tests/ here, on all the platforms I can
run Mercurial on.
All the tests are run with an installed version of mercurial-crew,
at changeset:
changeset: 3464:33b6c8193652
tag: tip
user: Alexis S. L. Carvalho <alexis at cecm.usp.br>
date: Wed Oct 18 18:47:50 2006 -0300
summary: Don't use test -e in tests - sh doesn't like it on Solaris
,--------------------------------------------------------------------------
| system: FreeBSD
| version: 7.0-CURRENT #1: Thu Oct 19 02:54:22 EEST 2006 (2006.10.18.15.56.11)
+--------------------------------------------------------------------------
| ..................................................................................................
| ERROR: test-push-http output changed
| --- Expected output
| +++ Test output
| @@ -9,9 +9,10 @@
| searching for changes
| push not authorized
| % expect authorization error: must have authorized user
| +abort: cannot start server: Address already in use
| pushing to http://localhost:20059/
| -searching for changes
| -push not authorized
| +abort: error: Connection reset by peer
| +kill: 15337: No such process
| % expect success
| pushing to http://localhost:20059/
| searching for changes
| ................
| ERROR: test-static-http output changed
| --- Expected output
| +++ Test output
| @@ -1,30 +1,0 @@
| -abort: Connection refused
| -255
| -copy: No such file or directory
| -changeset: 0:53e17d176ae6
| -tag: tip
| -user: test
| -date: Mon Jan 12 13:46:40 1970 +0000
| -summary: test
| -
| -requesting all changes
| -adding changesets
| -adding manifests
| -adding file changes
| -added 1 changesets with 1 changes to 1 files
| -1 files updated, 0 files merged, 0 files removed, 0 files unresolved
| -checking changesets
| -checking manifests
| -crosschecking files in changesets and manifests
| -checking files
| -1 files, 1 changesets, 1 total revisions
| -foo
| -adding quux
| -changegroup: u=static-http://localhost:20059/remote
| -pulling from static-http://localhost:20059/remote
| -searching for changes
| -adding changesets
| -adding manifests
| -adding file changes
| -added 1 changesets with 1 changes to 1 files
| -(run 'hg update' to get a working copy)
|
| ERROR: test-static-http failed with error code 3840
| ...........
| # Ran 125 tests, 0 skipped, 2 failed.
`--------------------------------------------------------------------------
,--------------------------------------------------------------------------
| system: Linux
| version: Fedora Core release 1 (Yarrow)
+--------------------------------------------------------------------------
| $ python run-tests.py
| .............................................................................................................................
| # Ran 125 tests, 0 skipped, 0 failed.
`--------------------------------------------------------------------------
,--------------------------------------------------------------------------
| system: Solaris
| version: Solaris 10 1/06 s10x_u1wos_19a X86 (amd64)
+--------------------------------------------------------------------------
| .........
| ERROR: test-bad-pull output changed
| --- Expected output
| +++ Test output
| @@ -1,4 +1,4 @@
| -abort: error: Connection refused
| +abort: error: Network is unreachable
| 255
| copy: No such file or directory
| abort: HTTP Error 404
| ................
| ERROR: test-conflict output changed
| --- Expected output
| +++ Test output
| @@ -1,11 +1,7 @@
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
| -merge: warning: conflicts during merge
| merging a
| -merging a failed!
| -0 files updated, 0 files merged, 0 files removed, 1 files unresolved
| -There are unresolved merges, you can redo the full merge using:
| - hg update -C 2
| - hg merge 1
| +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
| +(branch merge, don't forget to commit)
| e7fe8eb3e180+0d24b7662d3e+ tip
| something else
| =======
| ................................
| ERROR: test-http-proxy output changed
| --- Expected output
| +++ Test output
| @@ -43,4 +43,4 @@
| added 1 changesets with 1 changes to 1 files
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
| %% bad host:port for proxy
| -abort: error: Connection refused
| +abort: error: Network is unreachable
| ............
| ERROR: test-merge-revert2 output changed
| --- Expected output
| +++ Test output
| @@ -9,11 +9,8 @@
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
| f248da0d4c3e tip
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
| -merge: warning: conflicts during merge
| merging file1
| -merging file1 failed!
| -0 files updated, 0 files merged, 0 files removed, 1 files unresolved
| -There are unresolved merges with locally modified files.
| +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
| diff -r f248da0d4c3e file1
| --- a/file1
| +++ b/file1
| .......
| ERROR: test-merge7 output changed
| --- Expected output
| +++ Test output
| @@ -6,13 +6,9 @@
| adding file changes
| added 1 changesets with 1 changes to 1 files (+1 heads)
| (run 'hg heads' to see heads, 'hg merge' to merge)
| -merge: warning: conflicts during merge
| merging test.txt
| -merging test.txt failed!
| -0 files updated, 0 files merged, 0 files removed, 1 files unresolved
| -There are unresolved merges, you can redo the full merge using:
| - hg update -C 1
| - hg merge 2
| +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
| +(branch merge, don't forget to commit)
| pulling from ../test-a
| searching for changes
| adding changesets
| @@ -20,18 +16,14 @@
| adding file changes
| added 1 changesets with 1 changes to 1 files (+1 heads)
| (run 'hg heads' to see heads, 'hg merge' to merge)
| -merge: warning: conflicts during merge
| resolving manifests
| overwrite None partial False
| ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360
| test.txt: versions differ -> m
| merging test.txt
| my test.txt at 451c744aabcc+ other test.txt at a070d41e8360 ancestor test.txt at faaea63e63a9
| -merging test.txt failed!
| -0 files updated, 0 files merged, 0 files removed, 1 files unresolved
| -There are unresolved merges, you can redo the full merge using:
| - hg update -C 3
| - hg merge 4
| +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
| +(branch merge, don't forget to commit)
| one
| <<<<<<<
| two-point-five
| ......................................
| ERROR: test-static-http output changed
| --- Expected output
| +++ Test output
| @@ -1,4 +1,4 @@
| -abort: Connection refused
| +abort: Network is unreachable
| 255
| copy: No such file or directory
| changeset: 0:53e17d176ae6
| ...........
| # Ran 125 tests, 0 skipped, 6 failed.
`--------------------------------------------------------------------------
,--------------------------------------------------------------------------
| system: Solaris
| version: Solaris 8 HW 12/02 s28s_hw1wos_06a SPARC
+--------------------------------------------------------------------------
| .........................
| ERROR: test-conflict output changed
| --- Expected output
| +++ Test output
| @@ -1,11 +1,7 @@
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
| -merge: warning: conflicts during merge
| merging a
| -merging a failed!
| -0 files updated, 0 files merged, 0 files removed, 1 files unresolved
| -There are unresolved merges, you can redo the full merge using:
| - hg update -C 2
| - hg merge 1
| +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
| +(branch merge, don't forget to commit)
| e7fe8eb3e180+0d24b7662d3e+ tip
| something else
| =======
| ............................................
| ERROR: test-merge-revert2 output changed
| --- Expected output
| +++ Test output
| @@ -9,11 +9,8 @@
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
| f248da0d4c3e tip
| 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
| -merge: warning: conflicts during merge
| merging file1
| -merging file1 failed!
| -0 files updated, 0 files merged, 0 files removed, 1 files unresolved
| -There are unresolved merges with locally modified files.
| +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
| diff -r f248da0d4c3e file1
| --- a/file1
| +++ b/file1
| .......
| ERROR: test-merge7 output changed
| --- Expected output
| +++ Test output
| @@ -6,13 +6,9 @@
| adding file changes
| added 1 changesets with 1 changes to 1 files (+1 heads)
| (run 'hg heads' to see heads, 'hg merge' to merge)
| -merge: warning: conflicts during merge
| merging test.txt
| -merging test.txt failed!
| -0 files updated, 0 files merged, 0 files removed, 1 files unresolved
| -There are unresolved merges, you can redo the full merge using:
| - hg update -C 1
| - hg merge 2
| +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
| +(branch merge, don't forget to commit)
| pulling from ../test-a
| searching for changes
| adding changesets
| @@ -20,18 +16,14 @@
| adding file changes
| added 1 changesets with 1 changes to 1 files (+1 heads)
| (run 'hg heads' to see heads, 'hg merge' to merge)
| -merge: warning: conflicts during merge
| resolving manifests
| overwrite None partial False
| ancestor faaea63e63a9 local 451c744aabcc+ remote a070d41e8360
| test.txt: versions differ -> m
| merging test.txt
| my test.txt at 451c744aabcc+ other test.txt at a070d41e8360 ancestor test.txt at faaea63e63a9
| -merging test.txt failed!
| -0 files updated, 0 files merged, 0 files removed, 1 files unresolved
| -There are unresolved merges, you can redo the full merge using:
| - hg update -C 3
| - hg merge 4
| +0 files updated, 1 files merged, 0 files removed, 0 files unresolved
| +(branch merge, don't forget to commit)
| one
| <<<<<<<
| two-point-five
| .................................................
| # Ran 125 tests, 0 skipped, 3 failed.
`--------------------------------------------------------------------------
More information about the Mercurial-devel
mailing list