On Tue, Sep 07, 2004 at 03:17:55PM +0100, Chia-liang Kao wrote:
> As there has some activities on the vcp depot, I did a vendor merge
> today and regen my patches.
>
> Meanwhile, vcp test suites almost all pass for me. There's only one
> failed (and seemed quite obvious):
Ok, that now passes here. It was test code cleanup, thankfully. All
tests now pass on Win32, need to test under Linux (and if I can get
Solaris in to VMWare, there too).
Thanks for the patch. Several bits applied, some notes inline.
> --- Makefile.PL (/vendor) (revision 1048)
> +++ Makefile.PL (/local) (revision 1048)
> + 'Text::Table' => 0,
Text::Table is developer-only, like BFD, so I don't hard require it.
Perhaps I should have a DEVELOPER=1 parameter to Makefile.PL
> --- lib/VCP/Filter/changesets.pm (/vendor) (revision 1048)
> +++ lib/VCP/Filter/changesets.pm (/local) (revision 1048)
> - unpack "w*", $changes->[$change_index]
> - if $changes->[$change_index];
> + unpack "w*",
> + exists $changes->[$change_index] ? $changes->[$change_index]
> : '';
How about this:
my @future_indexes =
exists $changes->[$change_index]
? grep $_ != $r_index,
unpack "w*", $changes->[$change_index]
: ();
> --- lib/VCP/Utils/p4.pm (/vendor) (revision 1048)
> +++ lib/VCP/Utils/p4.pm (/local) (revision 1048)
> @@ -830,7 +830,7 @@ sub p4_set_client_spec {
> $self->p4( [ "client", "-i" ], \$client_spec, \my $out ) ;
>
> die "unexpected stdout from p4:\np4: ", $out
> - unless $out =~ /^Client\s.*\ssaved\./ ;
> + unless $out =~ /^Client\s.*\s(saved|.*not changed)\./ ;
When does this occur, --continue? I'm wondering if we should try to
avoid changing the client spec in whatever case causes this. And I'd
like to build a test case for it, if you can tell me how.
> -lib/VCP/Filter/logmemsize.pm
That's now in the repository. Odd, though, neither logmemsize.pm nor
swapnfs.c,v were in my local MANIFEST. What gives?
- Barrie
|
