Changeset 2355 in /cluster/svnroot


Ignore:
Timestamp:
Apr 17, 2010 4:19:10 PM (11 years ago)
Author:
skylar
Message:

just going to use --arch rather than detecting again (#427)

Location:
bccd-ng/branches/skylar-64test
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • bccd-ng/branches/skylar-64test/bin/build_livecd.pl

    r2350 r2355  
    1919my($debmirror,$websvn,$rc,$out,$ft,$tmpdir,$cwd,$svnrev,
    2020   $Bccd,$allout,$rpkgs,$nouid,$nogid,$debmirror_host,
    21    $debmirror_name,$debsecmirror,$dir,$arch);
     21   $debmirror_name,$debsecmirror,$dir);
    2222my(@lsof,@pids,@rd);
    2323
     
    120120}
    121121
    122 $arch = $Bccd->run_test(
    123         "get_arch",
    124         "",
    125         "Got architecure of system.",
    126         );
    127 
    128122$Bccd->run_test(
    129123    "chdir",
     
    11081102    "Fetched architecure-specific items for $arch.",
    11091103    $svnrev,
    1110     "$websvn/trees/arch/$arch",
     1104    "$websvn/trees/arch/$opts{'arch'}",
    11111105    );
    11121106
  • bccd-ng/branches/skylar-64test/trees/usr/local/lib/site_perl/5.10.0/Bccd.pm

    r2354 r2355  
    9999sub cmd_num_die( $@ ) {
    100100    my($self,@cmds) = @_;
    101     my $sub = "cmd_num_due";
     101    my $sub = "cmd_num_die";
    102102    $self->enter_sub($sub);
    103103   
     
    406406}
    407407
    408 sub test_get_arch {
    409         my($self,$type,$okrc,$msg) = @_;
    410         my $sub = 'test_get_arch';
    411         my $rc;
    412         if($okrc eq '') {
    413                 $okrc = 1;
    414         }
    415 
    416         my $arch = (POSIX::uname())[5];
    417         if(defined($arch)) {
    418                 $rc = 1;
    419                 $self->ok_msg($msg);
    420         }
    421         else {
    422                 $rc = 0;
    423                 $self->fail_msg($msg);
    424         }
    425 
    426         return ($arch,$msg);
    427 }
    428 
    429408sub test_regexsub_file( $$$$$$$ ) {
    430409    my($self,$type,$okrc,$msg,$file,$regex1,$regex2) = @_;
     
    11691148    my $sub = "run_test";
    11701149    $self->enter_sub($sub);
    1171     my $metatests = 2;
     1150    my $metatests = 3;
    11721151    my($rc,$out,$type,$okrc,$msg,$i);
    11731152    my @cmds;
    11741153
    11751154    if($#args < $metatests ) { # there must be at least one command
    1176         $self->log_and_die("ERROR",$sub,"Not enough arguments to run_test @args! Minimum of $metatests.");
     1155        $self->log_and_die("ERROR",$sub,"Not enough arguments to run_test! Minimum of $metatests.");
    11771156    }
    11781157
     
    11931172    }
    11941173    elsif( $type =~ m/^chdir$/ ) {
    1195         if( $#cmds != 1 ) {
     1174        if( $#cmds != 0 ) {
    11961175            $self->cmd_num_die(@cmds);
    11971176        }
     
    13211300        $rc = $self->test_regexsub_file($type,$okrc,$msg,$cmds[0],$cmds[1],$cmds[2]);
    13221301    }
    1323         elsif($type =~ m/^get_arch$/) {
    1324                 ($rc,$out) = $self->test_get_arch($type,$okrc,$msg);
    1325         }
    13261302    else {
    13271303        $self->log_and_die("ERROR",$sub,"This is an undefined test: $type!");
Note: See TracChangeset for help on using the changeset viewer.