Index: trunk/psLib/configure.ac =================================================================== --- trunk/psLib/configure.ac (revision 9802) +++ trunk/psLib/configure.ac (revision 9803) @@ -453,5 +453,4 @@ test/mathtypes/Makefile test/types/Makefile - test/FullUnitTest test/pstap/Makefile test/pstap/src/Makefile Index: trunk/psLib/test/.cvsignore =================================================================== --- trunk/psLib/test/.cvsignore (revision 9802) +++ trunk/psLib/test/.cvsignore (revision 9803) @@ -2,5 +2,4 @@ Makefile Makefile.in -FullUnitTest *.bb *.bbg Index: trunk/psLib/test/FullUnitTest.in =================================================================== --- trunk/psLib/test/FullUnitTest.in (revision 9802) +++ (revision ) @@ -1,358 +1,0 @@ -#!/usr/bin/perl -# -# This is a perl script test harness which will recursively search the -# directory tree looking for files named UnitTest and then execute -# the script -# -# $Revision: 1.2 $ $Name: not supported by cvs2svn $ -# $Date: 2005-10-01 02:22:19 $ -# -# Copyright 2004 Maui High Performance Computing Center, University of Hawaii -# -############################################################################## - -use FindBin qw($Bin); - -$runTest = "$Bin/runTest"; - -# Provide functions for determining the pathname of current working directory -use Cwd; - -# Provides functions for handling psS64 command line options -use Getopt::Long; - -$recursive=1; -$jobs=1; -# Assign variables based on the presence of command line options to the script -# The ! option allows for --nooption to be set to zero -# (e.g. --noverbose --recursive causes $verbose=0 and $recursive=1) -GetOptions( - "jobs!" => \$jobs, - "verbose!" => \$verbose, - "recursive!" => \$recursive, - "silent!" => \$silent, - "clean!" => \$clean, - "makeonly!" => \$makeonly, - "help!" => \$help -); - -if ($help) { - printf <<'HELPTEXT'; -SYNPOSIS : FullUnitTest [options] [arguments] - - where: - options = - --jobs number of threads to use for make - --help Print this help text - --verbose Display extra information to user - --norecursive Test only the specified or current directory - --silent Don't display any information to user - --clean Perform a 'make clean' before making tests - --makeonly Only make the test drivers, don't execute them - - arguments = directory(ies) to perform tests [if not specified, assumes ','] - - RETURN : integer number of tests which failed - -HELPTEXT - exit; -} - -# Check if both silent and verbose options are set and if so stop the script -die "Can't specify both verbose and silent options." if ( $verbose && $silent ); - -# add the built psLib library path to LD_LIBRARY_PATH and DYLD_LIBRARY_PATH -# environment variables - -$ENV{'LD_LIBRARY_PATH'} = "@abs_top_builddir@/src/.libs:$ENV{'LD_LIBRARY_PATH'}"; -$ENV{'DYLD_LIBRARY_PATH'} = "@abs_top_builddir@/src/.libs:$ENV{'DYLD_LIBRARY_PATH'}"; - -# Initialize variables for counting the makes and test failures and the -# total makes and tests performed -$makeFailCount = 0; -$testpointFailCount = 0; -$testDriverFailCount = 0; -$totalTestpoints = 0; -$totalTestDrivers = 0; -$totalMakes = 0; - -# Initialize variable indicating how many arguements were passed -$args = 0; - -# check if no arguments -- if so, we should process current directory -if ($args == 0) { - push(@ARGV,$ENV{"PWD"}); -} - -# Loop through all the arguements passed to the script -foreach (@ARGV) { - - # Remove newline if there is one - chomp; - - # Increment number of arguements found - $args++; - - # Set variable to current working directory - $cwd = cwd; - - # Change directory to the directory of the arguement - chdir($_); - - # Check for the recursive option - if ($recursive) { - - # Invoke subroutine to go to the lowest directory in tree - # starting at the specified directory - &worm($_); - } - else { - - # Invoke subroutines to run the test at the specified directory - &makeTestDrivers($_); - if (! $makeonly) { - &executeTestDrivers($_); - } - } - - # Change directory back to the directory where FullUnitTest was invoked - chdir($cwd); -} - -# Check if there were any failures during make or testing -if ( $makeFailCount > 0 || $testDriverFailCount > 0 ) { - - # Display summary of failures - print("\nMake Failures = $makeFailCount out of $totalMakes"); - print( -"\nTest Driver Failures = $testDriverFailCount out of $totalTestDrivers\n" - ); - print( "\nMakes that failed:\n " . join( "\n ", @makesFailed ) . "\n" ) - if $makeFailCount; - print( "\nTests that failed:\n " . join( "\n ", @testsFailed ) . "\n" ) - if $testDriverFailCount; -} -else { - - # Display message of all makes and tests pass to user if silent option - # not specified - print( -"\nAll $totalTestDrivers Test Drivers Passed with $totalTestpoints Testpoints.\n" - ) - if ( !$silent ); -} - -# Exit with the number of tests that failed -exit($testDriverFailCount); - -################################################################################ -# -# SUBROUTINE: worm -# -# Description: This subroutine will perform the necessary unit tests be -# calling makeTestDrivers and executeTestDrivers subroutines -# and then check each subdirectory below the base directory -# recursively. -# -# Parameter(s): base directory to start testing -# -# Return: None -# -################################################################################ - -sub worm { - - # Assign local variable to input parameter - local ($base_dir) = @_; - local ( @files, $i ); - - # Invoke subroutine to make test driver in the base directory - &makeTestDrivers($base_dir); - - if (! $makeonly) { - # Invoke subroutine to execute tests in the base directory - &executeTestDrivers($base_dir); - } - - # Create array of entries found in directory - @files = <*>; - - # Loop through the file list looking for another directory that is not - # labelled CVS and recursively invoke subroutine worm - $i = 0; - while ( $files[$i] ) { - - # Check for directory and directory not labelled CVS - if ( -d $files[$i] - && ( $files[$i] ne "CVS" ) - && ( $files[$i] ne "temp" ) - && ( $files[$i] ne "verified" ) ) - { - - # Change current directory to directory found - chdir( $files[$i] ); - - # Invoke subroutine worm again - &worm( $files[$i] ); - - # Change current directory back to parent - chdir(".."); - } - - # Increment file list index - $i++; - } -} - -################################################################################ -# -# SUBROUTINE: makeTestDrivers -# -# Description: This subroutine will perform a make for all the necessary -# test drivers. This will occur in the specified -# base directory which is passed as the only parameter. -# -# Parameter(s): base directory where make and test drivers are located -# -# Return: None -# -################################################################################ - -sub makeTestDrivers { - local ($base_dir) = @_; - local ($pwd); - - # Set variable pwd to current working directory - $pwd = cwd; - - # Display message to user in which directory testing is taken place only - # if the silent command option was not specified - print("---- Entering $pwd ----\n") if ( !$silent ); - - # Check for the existence of a file name Makefile in current directory - if ( -e "Makefile" ) { - - # Increment the total number of makes executed - $totalMakes++; - - if ($clean) { - - # Execute the make clean - `make clean`; - - } - - # Execute the make and save results - $_ = join( "\n|| ", split( "\n", "\n" . `make -j $jobs tests` ) ); - - # Check the output of make for return value != 0 or any of the - # following words: FAILED, FAULT, ERROR, Not found, SIGNAL - if ( $? != 0 ) { - - # Display the errored output of make if silent option not enabled - print("$_\n") if ( !$silent ); - - # Display the make failed in the current directory - print("\nMake for $pwd Failed\n"); - - # Increment the number of makes that have failed - $makeFailCount++; - - # Push the current working directory onto the list of failed - # make directories list - push( @makesFailed, $pwd ); - } - else { - - # Display the results of the successful make if verbose option set - print("$_\n") if $verbose; - - # Display the make was successful if silent option not set - print("\nMake successful.\n") if ( !$silent ); - } - } -} - -################################################################################ -# -# SUBROUTINE: executeTestDrivers -# -# Description: This subroutine will execute all the necessary -# test drivers. This will occur in the specified -# base directory which is passed as the only parameter. -# -# Parameter(s): base directory where make and test drivers are located -# -################################################################################ - -sub executeTestDrivers { - local ($base_dir) = @_; - local ( @files, $j ); - local ($pwd); - local ($exitValue) = 0; - - # Set variable to pwd to current test directory - $pwd = cwd; - - # Create a list of all elements in base directory - @files = <*>; - - # Loop through all the items in the files array - $initialTest = 0; - $j = 0; - while ( $files[$j] ) { - - # Check that the item is not a directory and is executable and - # conforms to the test driver naming convention TST - if ( !( -d $files[$j] ) - && ( -x $files[$j] ) - && ( $files[$j] =~ /^TST/i || $files[$j] =~ /^ATST/i ) ) - { - - # Increment total number of test drivers executed - $totalTestDrivers++; - - # Display message to user of which test driver is being executed - print("--- Executing test driver $files[$j]\n") if ( !$silent ); - - # Execute the test driver - if ($silent) { - system("$runTest --quiet ./$files[$j]"); - } elsif ($verbose) { - system("$runTest --printpassfail ./$files[$j]"); - } else { - system("$runTest ./$files[$j]"); - } - $retVal = $?; - - # Count testpoints - $testPattern = "\"\\*\\*\\*\\* TESTPOINT \\*\\*\\*\\*\""; - $totalPoints = `grep -c $testPattern temp/$files[$j].stdout`; - $totalPoints += `grep -c $testPattern temp/$files[$j].stderr`; - $failPoints = - `grep "> TESTPOINT FAILED" temp/$files[$j].stdout | wc -l`; - $failPoints += - `grep "> TESTPOINT FAILED" temp/$files[$j].stderr | wc -l`; - $testpointFailCount += $failPoints; - $totalTestpoints += $totalPoints; - - # Check result of test driver - if ( $retVal != 0 ) - { - - # Display test driver failed - $failPoints++; - print( - "Test driver: $files[$j] Failed (Return value $retVal).\n"); - - # Increment the total number of test failed - $testDriverFailCount++; - - # Push the current working directory on the list of failed - push( @testsFailed, $pwd . "/" . $files[$j] ); - } - } - $j++; - } -} - Index: trunk/psLib/test/runTest =================================================================== --- trunk/psLib/test/runTest (revision 9802) +++ (revision ) @@ -1,394 +1,0 @@ -#!/usr/bin/perl -# -# This is a perl script to execute a single test driver program. The script -# will examine the return value of the test driver and capture STDOUT, STDERR -# to files. If the return value of the test driver is not zero, the test is -# deemed a failure. STDOUT and STDERR files will be place in a subdirectory -# named temp and the files will be compared with verified STDOUT, STDERR files -# in a subdirectory named verified. If there are no STDOUT, STDERR files in -# the verified directory, the captured STDOUT, STDERR files will be scanned -# for words which indicate a failure. -# -# Assumptions: A verified subdirectory with STDOUT, STDERR files exists for -# the test driver specified in the arguements if an exact -# match of the streams STDOUT, STDERR is necessary. -# -# Return values: -# Bit mapped values -# 0 Test run successfull and all tests passed -# 1 Verified directory did not exist -# 8 STDOUT files did not compare -# 16 STDERR files did not compare -# 32 Test driver doesn't exist or is not executable -# 64 Test driver did not return zero -# -# SYNOSIS: runTest testDriverName -# -# $Revison: $ $Name: not supported by cvs2svn $ -# $Date: 2005-11-30 22:03:58 $ -# -# Copyright 2004 Maui High Performance Computering Center, University of Hawaii -# -################################################################################ - -# Provides functions for handling psS64 command line options -use Getopt::Long; - -$verifiedDir = "verified"; - -# Assign variables based on the presence of command line options to the script -GetOptions( - "reset!" => \$reset, - "resetStderr!" => \$resetStderr, - "resetStdout!" => \$resetStdout, - "verified=s" => \$verifiedDir, - "help!" => \$help, - "quiet!" => \$quiet, - "printpassfail!" => \$verbose, - "printdiff!" => \$printdiff -); - -if ($help || $#ARGV < 0) { - print "\nUsage: runTest [--help] [--quiet] [--resetStderr] [--resetStdout] [--reset] \\\n", - " [--verified=DIR] [--printpassfail] [--printdiff] testfile(s)\n\n", - "Options include:\n", - " --help Prints this help message\n", - " --quiet Suppresses all messages\n", - " --resetStderr Resets the STDERR expected output file in the verified\n", - " directory\n", - " --resetStdout Resets the STDOUT expected output file in the verified\n", - " directory\n", - " --reset Equivalent to --resetStderr plus --resetStdout\n", - " --verified=DIR Specifies the location of the verified directory\n", - " --printpassfail Prints a PASS or FAIL message for each test in each file\n", - " --printdiff Prints any differences found in the test output and\n", - " verified expected output.\n\n"; - exit(0); -} - -if ($reset) { - $resetStderr = 1; - $resetStdout = 1; -} - -# Initialize exit value -$exitValue = 0; - -# Set up the PSLIB_ROOT environment variable if the user doesn't have it set -if ( $ENV{'PSLIB_ROOT'} ) { - - # Add PSLIB_ROOT/lib to LD_LIBRARY_PATH and DYLD_LIBRARY_PATH environment vars - $ENV{'LD_LIBRARY_PATH'} = "$ENV{'PSLIB_ROOT'}/src/.libs:$ENV{'LD_LIBRARY_PATH'}"; - $ENV{'DYLD_LIBRARY_PATH'} = "$ENV{'PSLIB_ROOT'}/src/.libs:$ENV{'DYLD_LIBRARY_PATH'}"; -} - -# Loop through the arguements passed to the script -foreach (@ARGV) { - chomp; - $testFile = $_; - - # Check if a temp directory already exists in the current work directory - if ( !( -e "temp" ) ) { - # Create temp directory to store STDOUT, STDERR files during test run - `mkdir temp`; - } - - # Check if a verified directory exists in the current work directory - if ( !( -e $verifiedDir ) ) { - - # Display message that verified subdirectory doesn't exist - print STDERR " Verified directory doesn't exist.\n"; - - # Exit script since the test cannot be run with verified files - $exitValue = 1; - } - - # Check if the test driver file exists and is executable - if ( ( -e $testFile ) && ( -x $testFile ) ) { - - # Invoke the test driver - system("./$testFile 1> temp/$testFile.stdout 2> temp/$testFile.stderr"); - - # Check the return value of the test driver. A value other than 0 - # indicates failure of the test driver unless the test driver is name - # with a leading 'a' which indicates the test driver is expecting an - # abort condition to terminate the driver. - if ( ( $? != 0 && ( $testFile !~ /^A/i ) ) - || ( $? == 0 && ( $testFile =~ /^A/i ) ) ) - { - - # Display failure message with return value to user - if ( $? != 0 && ( $testFile !~ /^A/i ) ) { - print STDERR "Failed - Test Driver returned $?, expected 0.\n"; - } - elsif ( $? == 0 && ( $testFile =~ /^A/i ) ) { - print STDERR "Failed - Test Driver returned $?, expected abort.\n"; - } - $exitValue |= 64; - } - - # Test driver succeeded. - - # Create filtered version of stdout and stderr - - # Open the STDOUT file for reading - open( OUTFILE, "< temp/$testFile.stdout" ); - - # Open mod file to place filtered STDOUT - open( MODFILE, "> temp/$testFile.stdout.mod" ); - open( MODFILE2, "> $verifiedDir/$testFile.stdout" ) if $resetStdout; - - # Replace the variable date, time and host information with constants - $hostname = `hostname`; - chop $hostname; - while () { - s/\s+\d+:\d+:\d+\w/