Changeset 2612 in /cluster/svnroot


Ignore:
Timestamp:
Sep 2, 2010 7:15:09 PM (10 years ago)
Author:
leemasa
Message:

Merged latest bccd-test stuff

Location:
bccd-ng/trunk
Files:
1 deleted
3 edited
2 copied

Legend:

Unmodified
Added
Removed
  • bccd-ng/trunk/bin/build_livecd.pl

    r2596 r2612  
    306306    );
    307307
    308 foreach my $file ( "bccd-networking", "bccd-passwd", "bccd-dhcp", "bccd-sshd", "bccd-nfs", "bccd-unite-sw",
    309           "bccd-nics", "bccd-dhcp-conf", "bccd-route", "bccd-keyboard", "bccd-fsrw", "bccd-mail" ) {
     308foreach my $file ( "bccd-networking", "bccd-passwd", "bccd-dhcp", "bccd-sshd", "bccd-nfs", "bccd-unite-sw", "bccd-nics", "bccd-dhcp-conf", "bccd-route", "bccd-keyboard", "bccd-fsrw", "bccd-mail", "bccd-test" ) {
    310309    $Bccd->run_test(
    311310        "chmod",
     
    733732}
    734733
    735 foreach my $script ("nfs-common", "mpd", "bccd-mount-devs",) {
     734foreach my $script ( "bccd-passwd","bccd-sshd", "bccd-nfs", "bccd-mail", "nfs-common", "vboxadd-service", "mpd", "bccd-test" ) {
    736735    $Bccd->run_test(
    737736        "system",
  • bccd-ng/trunk/trees/home/bccd/tests/bccd_test_suite.pl

    r2589 r2612  
    44#Written by Samuel Leeman-Munk
    55#Runs test scripts and compares with control output in BCCD.
    6 #Emails differences to bccd-developers@bccd.net
     6#with --mail, emails differences to bccd-developers@bccd.net
     7#**********************************************************#
    78#**********************************************************#
    89
     
    1314
    1415use bccd_test_suite;
     16use test_defs;
    1517
    1618#Constants
     
    4749        'messy' => \$messy,
    4850        );
     51if ($mail == $DEFAULSE){
     52        if ($mailto ne $DEFAULT_MAILTO){
     53                $mail = TRUE;
     54        }
     55        else{
     56                $mail = FALSE;
     57        }
     58}
    4959
    5060#By default, verbose turns on when mail is turned off
     
    8494    if ($test ne $SEPARATOR_STRING){
    8595        print "$test\n";
    86         $bccd_test_suite::tests{$test}->($testdir,$test);
     96        $tests::tests{$test}->($testdir,$test);
    8797    }
    8898}
     
    163173                }
    164174
    165                 my %mail = ("From"    , '<tests@bccd.net>',
     175                my %mail = ("From"    , '<noreply@bccd.net>',
    166176                                "To"      , '<sleemanmunk@gmail.com>',
    167177                                "Subject" , $subject,
  • bccd-ng/trunk/trees/home/bccd/tests/bccd_test_suite.pm

    r2589 r2612  
    22package bccd_test_suite;
    33use strict;
    4 use vars qw(%tests);
    54
    65#Trim function to remove whitespace
     
    120119}
    121120
    122 #############################LIST OF TEST DEFINITIONS##########################
    123 
    124 %tests = (
    125                 'test' => sub { #Test the test suite
    126                 (my $testdir, my $testname) = @_;
    127                 my $storeOutput = generate_storeOutput($testdir,$testname);
    128                 system("
    129                 echo \"trireme\ngalley\ncaesar\" $storeOutput
    130                 echo \"ok, it works.\" $storeOutput
    131                 ")
    132                 },
    133 
    134                 'fail' => sub { #Guarantee an error report
    135                 (my $testdir, my $testname) = @_;
    136                 my $storeOutput = generate_storeOutput($testdir,$testname);
    137                 system( "seq 1 100 | sort -R $storeOutput");
    138                 },
    139 
    140                 'system' => sub { #Print system information
    141                 (my $testdir, my $testname) = @_;
    142                 my $storeOutput = generate_storeOutput($testdir,$testname);
    143                 system("       
    144                 uname -a $storeOutput
    145                 cat /proc/cpuinfo $storeOutput
    146                 ");
    147                 },
    148        
    149                 'BCCD' => sub { #Test the BCCD's built-in tests
    150                
    151                 },
    152                        
    153                 'GalaxSee' => sub { #Test GalaxSee
    154                         (my $testdir, my $testname) = @_;
    155                         mpi_test($testdir, $testname);
    156                 },
    157 
    158                 'Life' => sub { #Test Conway's Game of Life
    159                         (my $testdir, my $testname) = @_;
    160                         mpi_test($testdir, $testname);
    161                 })
     121return 1;
Note: See TracChangeset for help on using the changeset viewer.