1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 203 204 205 206 207 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 235 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 308 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 324 325 326 327 328 329 330 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 380 381 382 383 384 385 386 387 388 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 450 451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 468 469 470 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 554 555 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 589 590 591 592 593 594 595 596 597 598 599 600 601 602 603 604 605 606 607 608 609 610 611 612 613 614 615 616 617 618 619 620 621 622 623 624 625 626 627 628 629 630 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 651 652 653 654 655 656 657 658 659 660 661 662 663 664 665 666 667 668 669 670 671 672 673 674 675 676 677 678 679 680 681 682 683 684 685 686 687 688 689 690 691 692 693 694 695 696 697 698 699 700 701 702 703 704 705 706 707 708 709 710 711 712 713 714 715 716 717 718 719 720 721 722 723 724 725 726 727 728 729 730 731 732 733 734 735 736 737 738 739 740 741 742 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 767 768 769 770 771 772 773 774 775 776 777 778 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 795 796 797 798 799 800 801 802 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 840 841 842 843 844 845 846 847 848 849 850 851 852 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 889 890 891 892 893 894 895 896 897 898 899 900 901 902 903 904 905 906 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 1010 1011 1012 1013 1014 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 1037 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107
|
package VCP::TestUtils ;
=head1 NAME
VCP::TestUtils - support routines for VCP testing
=cut
use Exporter ;
@EXPORT = qw(
assert_eq
compile_dtd_cmd
copy_dir_tree
get_vcp_output
ok_or_diff
perl_cmd
parse_files_and_revids_from_head_revs_db
parse_files_and_revids_from_revml
parse_files_and_revids_from_p4_files
parse_files_and_revids_from_cvs_history
rm_dir_tree
slurp
tmpdir
vcp_cmd
p4d_borken
cvs_borken
init_cvsroot
vss_borken
s_content
rm_elts
run
run_p4
) ;
@ISA = qw( Exporter ) ;
use strict ;
use Carp ;
use Cwd ;
use File::Copy;
use File::Find;
use File::Path ;
use File::Spec ;
use IPC::Run3;
use POSIX ':sys_wait_h' ;
use Text::Diff ;
use VCP::Utils qw( shell_quote empty escape_filename );
use VCP::Logger qw( lg_fh log_file_name );
=head1 General utility functions
=over
=cut
{
my @tmp_dirs ;
END { rmtree \@tmp_dirs unless $ENV{VCPNODELETE} }
sub mk_tmp_dir {
confess "undef!!" if grep !defined, @_ ;
rmtree \@_ ;
mkpath \@_, 0, 0770 ;
push @tmp_dirs, @_ ;
}
}
=item copy_dir_tree
copy_dir_tree $src, $dest;
Copy source directory tree to a destination directory. Accepts
absolute or relative directory names, but doesn't do tilde expansion.
=cut
sub copy_dir_tree {
croak "usage $0 <src-dir> <dest-dir>\n"
unless @_ == 2;
my ($src_dir, $dest_dir) = @_;
$src_dir = File::Spec->rel2abs( $src_dir );
$dest_dir = File::Spec->rel2abs( $dest_dir );
croak "destination and source directories are the same\n"
if $dest_dir eq $src_dir;
croak "destination directory specified as a subdir of source directory, stopping.\n"
if 0 == index $dest_dir, $src_dir;
croak "source directory '$src_dir' doesn't exist\n"
unless -e $src_dir;
croak "source directory '$src_dir' isn't a directory\n"
unless -d $src_dir;
croak "destination '$dest_dir' already exists\n"
if -e $dest_dir;
my $src_dir_re = quotemeta $src_dir;
find(
{
no_chdir => 1,
wanted => sub {
my $newname = $_;
$newname =~ s/^$src_dir_re/$dest_dir/ ;
my ( $perms, $uid, $gid ) = (stat)[2,4,5];
if ( -d ) { # source was a directory
mkdir $newname or croak "couldn't create directory '$newname': $!\n";
}
else {
copy $_, $newname or croak "couldn't copy file from '$_' to '$newname'\n";
}
chmod $perms, $newname or warn "$!: chmod()ing $newname\n";
chown $uid, $gid, $newname or warn "$!: chown()ing $newname\n";
},
},
$src_dir
);
}
=item rm_dir_tree
rm_dir_tree $path;
Remove a directory tree. Does not complain if it's not there to remove.
=cut
sub rm_dir_tree {
croak "usage $0 <doomed-dir>\n"
unless @_ == 1;
my( $doomed_dir ) = @_;
return unless -e $doomed_dir;
rmtree [ $doomed_dir ], 0;
}
=item assert_eq
DEPRECATED. Use ok_or_diff() instead.
assert_eq $test_name, $expected, $got;
=cut
sub assert_eq {
my ( $name, $in, $out ) = @_ ;
croak diff \$in, \$out, { CONTEXT => 10 } if $in ne $out ;
}
=item ok_or_diff
ok_or_diff $got, $expected, ...;
Use instead of ok to compare two strings and output a diff if they
are indeed different. Uses Test::Difference's eq_or_diff() if present,
otherwise falls back to Text::Diff::diff(). Calls Test::ok().
If $got is empty and $expected is longer than 2 lines, diff() is not
called and a special message is generated. This is to prevent
SPAMming out huge diffs when no output is received but $expected is big.
=cut
#eval "use Test::Differences"; ## not suitable for *huge* diffs
sub ok_or_diff {
for ( @_[0,1] ) {
if ( ref ) {
require Data::Dumper;
$_ = Data::Dumper::Dumper( $_ );
}
}
if ( $_[0] ne $_[1] ) {
my ( $got, $expected, @rest ) = @_;
my $expected_lines = $expected =~ tr/\n//;
if ( $expected_lines > 2 && ! length $got ) {
@_ = ( $got, "$expected_lines lines of output", @rest );
}
else {
require File::Basename;
my $prog_name = File::Basename::basename( $0 );
my $tmp = File::Spec->tmpdir ;
my $test_name = File::Spec->catfile(
$tmp, "$prog_name.$Test::ntest"
);
open GOT, ">$test_name.got";
binmode GOT;
print GOT $_[0];
close GOT;
open EXPECTED, ">$test_name.expected";
binmode EXPECTED;
print EXPECTED $_[1];
close EXPECTED;
print "# output written to $test_name.expected $test_name.got\n";
my $options = @_ > 2 ? $_[2] : {};
## Handle both eq_or_diff() and diff() options syntax.
my $context = $options->{CONTEXT} || $options->{context} || 10;
$options->{context} = $options->{CONTEXT} = $context;
$_[2] = $options;
# goto &eq_or_diff if defined &eq_or_diff;
my $lg_fh = lg_fh;
my $diff = diff( \$expected, \$got, $options );
print $lg_fh $diff;
$rest[0] .= " " if defined $rest[0] && length $rest[0];
$rest[0] .= "see $test_name.expected $test_name.got and "
. log_file_name;
my $lines = $diff =~ tr/\n//;
@_ = ( "differences (diff -u is approx $lines lines)", "", @rest );
}
}
goto &Test::ok;
}
=item slurp
$guts = slurp $filename ;
@lines = slurp $filename;
read entire contents of file and return as a scalar, or array in
array context (splitting on newlines.)
=cut
sub slurp {
my ( $fn ) = @_ ;
open F, "<$fn" or croak "$!: $fn" ;
binmode F ;
local $/ ;
my $s = <F>;
close F;
return $s;
}
=item perl_cmd
@perl = perl_cmd
Returns a list containing the Perl executable and some options to reproduce
the current Perl options , like -I.
=cut
sub perl_cmd {
my %seen ;
return (
$^X,
(
map {
my $s = $_ ;
$s = File::Spec->rel2abs( $_ ) ;
"-I$s" ;
} grep ! $seen{$_}++, @INC
)
) ;
}
=item find_command
@vcp = find_command "vcp"
Find a script within the main distro directory or one subdir under it.
Looks for "bin/<cmd>" and "../bin/<cmd>". This should be adequate for
almost all uses.
=cut
sub find_command {
## We always run vcp by doing a @perl, vcp, to make sure that vcp runs under
## the same version of perl that we are running under.
my $cmd = shift;
$cmd = "bin/$cmd" if -e "bin/$cmd" ;
$cmd = "../bin/$cmd" if -e "../bin/$cmd" ;
$cmd = File::Spec->rel2abs( $cmd ) ;
return $cmd;
}
=item vcp_cmd
@vcp = vcp_cmd
Returns a list containing the Perl executable and some options to reproduce
the current Perl options , like -I.
vcp_cmd assumes it is called from within the main distro directory or one
subdir under it, since it looks for "bin/vcp" and "../bin/vcp". This should be
adequate for almost all uses.
vcp_cmd caches it's results to allow it to be run from other directories after
the first time it's called. (this is not a significant performance improvement;
running the vcp process takes several orders of magnitude longer than the quick
checks vcp_cmd does).
If $ENV{VCPTESTCOMMAND} is set, it is treated as a path to the executable
to run plus parameters. If the path includes spaces, it must be enclosed in
quotation marks. If the path is relative, it is assumed to be relative
to the current working directory.
=cut
my @vcp_cmd ;
sub vcp_cmd {
if ( !empty $ENV{VCPTESTCOMMAND} ) {
my @chunks =
grep length,
split /"((?:""|[^"])*)"|\s+/, $ENV{VCPTESTCOMMAND};
die "Invalid VCPTESTCOMMAND: '$ENV{VCPTESTCOMMAND}'\n"
unless @chunks && ! empty( $chunks[0] );
require File::Spec;
$chunks[0] = File::Spec->rel2abs( $chunks[0] );
return @chunks;
}
unless ( @vcp_cmd ) {
## We always run vcp by doing a @perl, vcp, to make sure that
## vcp runs under the same version of perl that we are running under.
@vcp_cmd = ( perl_cmd, find_command( 'vcp' ), '-q' ) ;
}
return @vcp_cmd ;
}
=item compile_dtd_cmd
@compile_dtd = compile_dtd_cmd
Returns a list containing the Perl executable and some options to
reproduce the current Perl options , like -I.
compile_dtd_cmd assumes it is called from within the main distro
directory or one subdir under it, since it looks for "bin/compile_dtd"
and "../bin/compile_dtd". This should be adequate for almost all
uses.
compile_dtd_cmd caches it's results to allow it to be run from other
directories after the first time it's called.
=cut
my @compile_dtd_cmd ;
sub compile_dtd_cmd {
unless ( @compile_dtd_cmd ) {
## We always run compile_dtd by doing a @perl, compile_dtd, to
## make sure that compile_dtd runs under the same version of
## perl that we are running under.
@compile_dtd_cmd = ( perl_cmd, find_command 'compile_dtd' ) ;
}
return @compile_dtd_cmd ;
}
=item run
Run a command using IPC::Run3::run3(), but with logging and a verbose
exception on non-0 result code.
Arguments are the same as and are passed to IPC::Run3::run3().
=cut
sub run {
confess "BUG: pass options in a trailing HASH instead of inline, please"
if grep defined && /ok_result_codes|in_dir|stderr_filter/, @_;
my $options = @_ && ref $_[-1] eq "HASH" ? pop : ();
my ( $cmd, $stdin, $stdout, $stderr, $timeout ) = @_;
$options ||= {};
my @log_cmd = @$cmd;
if ( $log_cmd[0] eq $^X ) { # running a command via perl
# replace all perl -I options with a "-I..." option to enhance
# readability.
@log_cmd = (
$log_cmd[0],
"-I...",
grep ! /^-I/, @log_cmd[1..$#log_cmd]
);
# vcp is run using perl. get rid of perl and its lengthy
# arguments in the log so the user doesn't need to see them.
my $i;
my @run_command = grep $i ||= /\bvcp\z/, @log_cmd[1..$#log_cmd];
@log_cmd = ( "vcp", @run_command[ 1..$#run_command ] ) if @run_command;
}
print "#\$ ", shell_quote( @log_cmd ), "\n";
my $run_cmd = $cmd;
my $start_time = time;
IPC::Run3::run3( $run_cmd, $stdin, $stdout, $stderr, $options );
my $r = $? >> 8;
$options->{ok_result_codes} ||= [0];
$r = undef
if grep $r == $_, @{$options->{ok_result_codes}};
croak "`", shell_quote( @log_cmd ), "`",
" returned $r, not one of (",
@{$options->{ok_result_codes}} == 1
? $options->{ok_result_codes}->[0]
: join( ", ", @{$options->{ok_result_codes}} ),
")"
if defined $r;
my $time = time - $start_time;
my $mins = int( $time / 60 );
printf "# %02d:%02d\n", $mins, $time - $mins * 60;
}
=item run_p4
calls 'run' to run p4 binary after deciding which platform specific
program to run.
determines p4 executable name based on operating system.
builds p4 options string from $p4_options hash
examples:
run_p4 \@args, \$stdin, \$stdout, \$stderr, $p4_options;
run_p4 [ qw(files) ], \undef, \$stdout, $p4_options;
arguments:
=over
=item 1.
array of words to add to end of p4 command
=item 2...
remaining arguments passed on to 'run' sub (except final arg)
=item final arg:
p4_options hash (may contain: port, user, client, password ... ?)
=back
=cut
sub run_p4 {
die "usage: run_p4 <array-of-additional-p4-commands> <p4-options-hash> [args-to-run-cmd]..."
unless @_ >= 2;
my $extra_p4_commands = shift;
my $p4_options = pop;
croak "no options passed" unless ref $p4_options eq "HASH" ;
my @p4_args;
local $ENV{P4PASSWD} = $p4_options->{password} if defined $p4_options->{password} ;
push @p4_args, '-p', $p4_options->{port} if defined $p4_options->{port} ;
push @p4_args, '-c', $p4_options->{client} if defined $p4_options->{client} ;
push @p4_args, '-u', $p4_options->{user} if defined $p4_options->{user} ;
push @p4_args, @$extra_p4_commands;
my $p4_binary = $^O =~ /Win32/ ? "p4.exe" : "p4" ;
run [ $p4_binary, @p4_args ], @_ ;
}
=item parse_files_and_revids_from_head_revs_db <options-hash>
options:
state_dir
repo_id
remove_rev_root (string to be removed from front of filename)
given a vcp state directory and repo_id, dump the head revs to a
string, and parse out the <name> and <rev_id> elements within each
<rev>, then return a string (sorted by line) of the form:
<name1> <max_revision_num1>
<name2> <max_revision_num2>
<name3> <max_revision_num3>
.
.
.
examples:
my $revs = parse_files_and_revids_from_head_revs_db
{ state_dir => $state_dir, repo_id => $repo_id }
my $revs = parse_files_and_revids_from_head_revs_db $state_dir $repo_id
{ state_dir => $state_dir, repo_id => $repo_id, remove_rev_root => "/ignore/" }
=cut
sub parse_files_and_revids_from_head_revs_db {
croak "usage: parse_files_and_revids_from_head_revs_db <options hash>"
unless @_ == 1 && ref $_[0] eq "HASH";
my $options = shift;
my $state_dir = $options->{state_dir};
croak "state_dir option required" if empty $state_dir;
my $repo_id = $options->{repo_id};
croak "repo_id option required" if empty $repo_id;
my $remove_rev_root = $options->{remove_rev_root};
my $store_loc = File::Spec->catfile( $state_dir, escape_filename $repo_id );
require VCP::HeadRevsDB;
my $db = VCP::HeadRevsDB->new( StoreLoc => $store_loc );
$db->open_existing_db;
my @dump = $db->dump;
$db->close_db;
my $revs = {};
my $line;
for( @dump ) {
$line++;
# make the dump look like parse_files_and_revids_from_revml
s/^[^\s]+\s+// ; # remove repo_id field
s/\s+/ /g ; # collapse multiple spaces
# Dump output seems to look like either of
# a/file/name => '1.1'
# or the more complicated cases:
# a/file/name<> => ('1.1','edit')
# a/file/name<1> => ('1.1','edit')
#
# This code makes the complicated case look like the simple case.
s/<[\d.]*> => \(/ => / ;
s/\)$// ;
s/'[^\d.',]+'//g ;
s/,*$// ;
# remove quotes from version number
s/=> '([\d.]+)'/=> $1/ ;
unless( empty $remove_rev_root ) {
die "'HeadRevsDB->dump' output lines weren't preceeded by $remove_rev_root as expected"
if index( $_, $remove_rev_root ) < 0 ;
$_ = substr $_, length $remove_rev_root ;
}
}
return join "", map "$_\n", sort @dump;
}
=item parse_files_and_revids_from_revml
given one or more revml filenames, slurp them up, parse out the <name>
and <rev_id> elements within each <rev>, then return a string (sorted
by line) of the form:
<name1> <max_revision_num1>
<name2> <max_revision_num2>
<name3> <max_revision_num3>
.
.
.
The final (optional) argument may be a reference to a hash of
parameters. Currently the only parameter is
IGNORE_REVS_WITH_DELETE_FLAG, which if true, causes any revs
containing the <delete /> or <delete/> tags to be ignored.
examples:
my $revs = parse_files_and_revids_from_revml $infile ;
my $revs = parse_files_and_revids_from_revml $infile1, $infile2 ;
=cut
sub parse_files_and_revids_from_revml {
my $options = @_ && ref $_[-1] ? pop : {} ;
croak "usage: parse_files_and_revids_from_revml <infile> ... [options-hash-ref]"
unless @_ >= 1;
my $ignore_revs_with_delete_tag = $options->{IGNORE_REVS_WITH_DELETE_FLAG};
my $revs = {};
for( @_ ) {
my $revml = slurp $_;
# find <rev> tag
while ( $revml =~ / < rev \b [^>] * > ( .*? ) < \/ rev > /gsx ) {
my $rev = $1;
# look for tags within <rev> tag
my ($name, $rev_id, $source_filebranch_id);
# <name> tag
$name = $1
if $rev =~ m{ <name> ( [^<] * ) <\/name> }gx ;
# <source_filebranch_id> tag
$source_filebranch_id = $1
if $rev =~ m{ <source_filebranch_id> ( [^<] * ) <\/source_filebranch_id> }gx ;
# <rev_id> tag
$rev_id = $1
if $rev =~ m{ <rev_id> ( [^<] * ) <\/rev_id> }gx ;
# <delete /> tag
next if $ignore_revs_with_delete_tag
&& $rev =~ m{<delete ?\/>} ;
croak "rev found without <name> tag at line $."
unless defined $name;
croak "rev found without <rev_id> tag at line $."
unless defined $rev_id;
croak "rev found without <source_filebranch_id> tag at line $."
unless defined $source_filebranch_id;
# keep name and source_filebranch_id for the greatest rev_id
require VCP::Rev;
if( ! exists $revs->{$source_filebranch_id}
|| VCP::Rev->cmp_id( $revs->{$source_filebranch_id}->{rev_id}, $rev_id ) < 0
)
{
$revs->{$source_filebranch_id}->{rev_id} = $rev_id;
$revs->{$source_filebranch_id}->{name} = $name;
}
}
}
return join "", map { "$revs->{$_}->{name} => $revs->{$_}->{rev_id}\n" } sort keys %$revs;
}
=item parse_files_and_revids_from_p4_files
Run p4 files command line to get list of changed files. Parse the
output so it can be diffed with the output of parse_files_and_revids_from_revml.
returns a string containing names and revision numbers, 1 per line.
See that sub above for a description of the output format.
arguments are:
=over
=item 1.
revision root, e.g. "//depot/something/". This string will be removed
from the output so it may be diffed with parse_files_and_revids_from_revml
output.
=item 2.
options hash for run_p4()
=item 3...
1 or more file[revRange] spec for p4 files command (run 'p4 help
files' and 'p4 help revisions' command line for formatting help)
=back
example usage:
parse_files_and_revids_from_p4_files $p4_rev_root, $p4_options, "//..."
=cut
sub parse_files_and_revids_from_p4_files {
croak "usage: parse_files_and_revids_from_p4_files <p4_rev_root>, <p4_options hash>, <file_spec>... "
unless @_ >= 3;
my ($p4_rev_root, $p4_options) = (shift, shift);
my $output;
run_p4 [ "files", @_ ],
\undef, \$output, $p4_options;
my $h = {};
while ( $output =~ m{(.*)#(\d+) - }g ) {
die "'p4 files' output lines weren't preceeded by $p4_rev_root as expected"
if index( $1, $p4_rev_root ) < 0 ;
my $name = substr $1, length $p4_rev_root ;
die "duplicate file names in p4 files output"
if exists $h->{$name};
$h->{$name} = $2 ;
}
return join "", map { "$_ => $h->{$_}\n" } sort keys %$h;
}
=item parse_files_and_revids_from_cvs_history
Run cvs history command line to get list of changed files. Parse the
output so it can be diffed with the output of parse_files_and_revids_from_revml.
returns a string containing names and revision numbers, 1 per line.
See that sub above for a description of the output format.
arguments are:
=over
=item 1.
cvs root directory.
=item 2.
cvs module name. This string will be removed from the output so it
may be diffed with parse_files_and_revids_from_revml output.
=back
example usage:
parse_files_and_revids_from_cvs_history "/home/blah/blah/cvsroot_0/", "module-blah"
=cut
sub parse_files_and_revids_from_cvs_history {
croak "usage: parse_files_and_revids_from_cvs_history <cvs-root>, <cvs-module>"
unless @_ == 2;
my ($cvs_root, $cvs_module) = (shift, shift);
my $output;
# run [ "cvs", "-d", $cvs_root, "history", "-xAM" ],
run [ "cvs", "-d", $cvs_root, "history", "-c" ],
\undef, \$output;
my $h = {};
my @lines = split /\n/, $output;
for ( @lines ) {
my @fields = split;
my $name = "$fields[7]/$fields[6]";
die "'cvs history' output line ($_), name ($name) didn't contain module name '$cvs_module' as expected"
if index( $name, $cvs_module ) != 0 ;
# remove cvs_module name plus directory separator
$name = substr $name, length( $cvs_module ) + 1;
# keep the greatest rev_id
my $rev_id = $fields[5];
$h->{$name} = $rev_id
if ! exists $h->{$name} || ! defined $h->{$name} || $h->{$name} lt $rev_id ;
}
return join "", map { "$_ => $h->{$_}\n" } sort keys %$h;
}
=item get_vcp_output
@vcp = get_vcp_output "foo:", "-bar" ;
Does a:
run [ vcp_cmd, @_, "sort:", "--", "revml:", ... ], \undef, \$out
or croak "`vcp blahdy blah` returned $?";
and returns $out. The "..." refers to whatever output options are needed
to make the test output agree with C<bin/gentrevml>'s test files
(t/test-*.revml).
You may pass in options as a hash reference as the final argument.
The supported option is:
revml_out_spec
which, if present, is tacked on to the revml: output spec's list of options,
=cut
sub get_vcp_output {
my $options = @_ && ref $_[-1] eq "HASH" ? pop : {} ;
my @args = ( @_, "sort:", "--", "revml:" );
push @args, @{ $options->{revml_out_spec} }
if exists $options->{revml_out_spec};
run [ vcp_cmd, @args ], \undef, \my $out;
return $out ;
}
=back
=head1 XML "cleanup" functions
These are used to get rid of content or elements that are known to differ
when comparing the revml fed in to a repository with the revml that
comes out.
=over
=item s_content
s_content
$elt_type1, $elt_type2, ..., \$string1, \$string2, ..., $new_content ;
Changes the contents of the elements, since some things, like suer id or
mod_time can't be the same after going through a repository.
If $new_val is not supplied, a constant string is used.
=cut
sub s_content {
my $new_val = ( @_ && ! ref $_[-1] ) ? pop : ();
$new_val = "deleted by test suite" unless defined $new_val ;
## Don't use "<" in $new_val or you'll trip up the test suite
my $elt_type_re = do {
my @a ;
push @a, quotemeta shift while @_ && ! ref $_[0] ;
join "|", @a ;
} ;
$$_ =~ s{(<($elt_type_re)[^>]*?>).*?(</\2\s*>)}{$1$new_val$3}sg
for @_ ;
}
=item rm_elts
rm_elts $elt_type1, $elt_type2, ..., \$string1, \$string2
rm_elts $elt_type1, $elt_type2, ..., qr/$content_re/, \$string1, \$string2
Removes the specified elements from the strings, including leading whitespace
and trailing line separators. If the optional $content_re regular expression
is provided, then only elements containing that pattern will be removed.
=back
=cut
sub rm_elts {
my $elt_type_re = do {
my @a ;
push @a, quotemeta shift while @_ && ! ref $_[0] ;
join "|", @a ;
} ;
my $content_re = @_ && ref $_[0] eq "Regexp" ? shift : qr/.*?/s ;
for ( @_ ) {
$$_ =~ s{^\s*<($elt_type_re)\b[^>]*?>$content_re</\1\s*>\r?\n}{}gsm;
$$_ =~ s{^\s*<($elt_type_re)\s*/>\r?\n}{}g;
}
}
=head1 p4 repository mgmt functions
=over
=item p4_borken
Returns true if the p4 is missing or too old (< 99.2).
=cut
sub p4d_borken {
my $p4dV = `p4d -V` || 0 ;
return "p4d not found" unless $p4dV ;
my ( $p4d_version ) = $p4dV =~ m{^Rev[^/]*/[^/]*/([^/]*)}m ;
my $min_version = 99.2 ;
return "p4d version too old, need at least $min_version"
unless $p4d_version >= $min_version ;
return "" ;
}
=item tmpdir
my $d = tmpdir ## create a directory like /tmp/vcp_95cvs2p4_#####
my $d = tmpdir( "foo" ); ## create a directory like /tmp/vcp_95cvs2p4_foo_#####
Return a temporary directory that will be deleted in an END block.
The prefix is advisory only and is meant to allow developers to intuit
the purpose of a temporary directory from its name.
See File::Spec::Unix's tmpdir() function for details, but you can set
the TMPDIR environment variable to control where the VCP test suite
places temp dirs (and, after testing, where vcp places test dirs, but
vcp has separate temp directory management functions).
=cut
sub tmpdir {
my ( $prefix ) = @_;
$prefix = ( ! empty $prefix ) ? "${prefix}_" : "";
require File::Basename;
( my $progname = File::Basename::basename( $0 ) ) =~ s/\..*//;
require File::Temp;
my $dir = File::Temp::tempdir(
"vcp_${progname}_${prefix}XXXX",
DIR => File::Spec->tmpdir,
);
## We clean up the dir ourselves because tempdir( CLEANUP => 1 ) doesn't
## delete the dir if it's nonempty.
mk_tmp_dir $dir;
$dir;
}
=back
=head1 CVS mgmt functions
=over
=item cvs_borken
Returns true if cvs -v works and outputs "Concurrent Versions System".
=cut
sub cvs_borken {
my $cvsV = `cvs -v` || 0 ;
return "cvs command not found" unless $cvsV ;
return "cvs command does not appear to be for CVS: '$cvsV'"
unless $cvsV =~ /Concurrent Versions System/;
return "" ;
}
=item init_cvsroot
my $cvs_options = init_cvsroot $prefix, $module_name ;
my $cvs_options = init_cvsroot $prefix, $module_name, $rootdir ;
Creates a CVS repository containing an empty module. Also sets
$ENV{LOGNAME} if it notices that we're running as root, so CVS won't give
a "cannot commit files as 'root'" error. Tries "nobody", then "guest".
Returns the options needed to access the cvs repository.
=cut
sub init_cvsroot {
my ( $prefix , $module, $root ) = @_ ;
my $is_tmp_root = ! defined $root;
$prefix = "" unless defined $prefix;
$prefix .= "_" if length $prefix;
$root = tmpdir( "${prefix}cvsroot" ) unless defined $root;
my $options = {
repo => $root,
work => tmpdir( "${prefix}cvswork" ),
} ;
my $cwd = cwd ;
## Give vcp ... cvs:... a repository to work with. Note that it does not
## use $cvswork, just this test script does.
$ENV{CVSROOT} = $options->{repo} ;
## CVS does not like root to commit files. So, try to fool it.
## CVS calls geteuid() to determine rootness (so does perl's $>).
## If root, CVS calls getlogin() first, then checks the LOGNAME and USER
## environment vars.
##
## What this means is: if the user is actually logged in on a physical
## terminal as 'root', getlogin() will return "root" to cvs and we can't
## fool CVS.
##
## However, if they've used "su", a very common occurence, then getlogin()
## will return failure (NULL in C, undef in Perl) and we can spoof CVS
## using $ENV{LOGNAME}.
if ( ! $> && $^O !~ /Win32/ ) {
my $login = getlogin ;
if ( ( ! defined $login || ! getpwnam $login )
&& ( ! exists $ENV{LOGNAME} || ! getpwnam $ENV{LOGNAME} )
) {
for ( qw( nobody guest ) ) {
my $uid = getpwnam $_ ;
next unless defined $uid ;
( $ENV{LOGNAME}, $> ) = ( $_, $uid ) ;
last ;
}
## Must set uid, too, to keep perl (and thus vcp) from bombing
## out when running setuid and given a -I option. This happens
## a lot in the test suite, since the tests often call vcp
## using "perl", "-Iblib/lib", "bin/vcp", ... to recreate the
## appropriate operating environment for Perl. If this becomes
## a problem, perhaps we can hack in a "run as user" option to
## VCP::Utils::cvs so that only the cvs subcommands are run
## setuid, or perhaps we can avoid passing "-I" to the perls.
$< = $> ;
warn
"# Setting real & eff. uids=",
$>,
"(",
$ENV{LOGNAME},
qq{) to quell "cvs: cannot commit files as 'root'"\n} ;
}
}
run [ qw( cvs init ) ];
chdir $options->{work} or die "$!: $options->{work}" ;
mkdir $module, 0770 or die "$!: $module" ;
chdir $module or die "$!: $module" ;
run [ qw( cvs import -m ), "$module import", $module, "${module}_vendor", "${module}_release" ];
chdir $cwd or die "$!: $cwd" ;
delete $ENV{CVSROOT} ;
# chdir ".." or die "$! .." ;
#
# system qw( cvs checkout CVSROOT/modules ) and die "cvs checkout failed" ;
#
# open MODULES, ">>CVSROOT/modules" or die "$!: CVSROOT/modules" ;
# print MODULES "\n$module $module/\n" or die "$!: CVSROOT/modules" ;
# close MODULES or die "$!: CVSROOT/modules" ;
#
# system qw( cvs commit -m foo CVSROOT/modules )
# and die "cvs commit failed" ;
return $options ;
}
=back
=head1 VSS mgmt functions
=over
=item vss_borken
Returns true if MKSS may be run.
=cut
sub vss_borken {
my $out = `mkss` ;
return "mkss command not found" if empty $out;
return "" ;
}
=back
=head1 COPYRIGHT
Copyright 2000, Perforce Software, Inc. All Rights Reserved.
This module and the VCP package are licensed according to the terms given in
the file LICENSE accompanying this distribution, a copy of which is included in
L<vcp>.
=cut
1 ;
|