Index: /trunk/psLib/test/sysUtils/Makefile =================================================================== --- /trunk/psLib/test/sysUtils/Makefile (revision 1700) +++ /trunk/psLib/test/sysUtils/Makefile (revision 1701) @@ -3,6 +3,6 @@ ## Makefile: test/sysUtils ## -## $Revision: 1.20 $ $Name: not supported by cvs2svn $ -## $Date: 2004-09-07 19:57:06 $ +## $Revision: 1.21 $ $Name: not supported by cvs2svn $ +## $Date: 2004-09-07 21:26:13 $ ## ## Copyright 2004 Maui High Performance Computing Center, University of Hawaii @@ -19,7 +19,5 @@ LDFLAGS := -L../../lib -lpslib -lpstest $(LDFLAGS) -TARGET = atst_psAbort_01 \ - atst_psAbort_02 \ - atst_psAbort_03 \ +TARGET = tst_psAbort \ tst_psMemory \ tst_psError \ Index: unk/psLib/test/sysUtils/atst_psAbort_01.c =================================================================== --- /trunk/psLib/test/sysUtils/atst_psAbort_01.c (revision 1700) +++ (revision ) @@ -1,43 +1,0 @@ -/** @file atst_psAbort_01.c - * - * @brief Test driver for psAbort function - * - * This test drivers contains the following test points for psAbort - * 1) Multiple type values in abort message - * - * @author Eric Van Alst, MHPCC - * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-06 22:34:06 $ - * - * Copyright 2004 Maui High Performance Computing Center, University of Hawaii - */ - -#include "pslib.h" -#include "psTest.h" - -int main ( int argc, - char *argv[] - ) -{ - int intval = 1; - long longval = 2; - float floatval = 3.01; - char charval = 'E'; - char *stringval = "E R R O R"; - - // Test point #1 Multiple type values placed in the error string - printPositiveTestHeader(stderr, "psAbort","Multiple type values in abort message"); - psAbort(__func__, - "ALL TYPES intval = %d longval = %ld floatval = %f charval = %c strval = %s", - intval, longval, floatval, charval, stringval ); - // Since abort should never get to the next statement it would indicate - // a test failure - printFooter(stderr,"psAbort","Multiple type values in abort message",false); - - // Program execution should have ended before this statement but if it - // does not return a zero since the expected return value of this test - // is a non-zero value - return 0; -} - Index: unk/psLib/test/sysUtils/atst_psAbort_02.c =================================================================== --- /trunk/psLib/test/sysUtils/atst_psAbort_02.c (revision 1700) +++ (revision ) @@ -1,35 +1,0 @@ -/** @file atst_psAbort_02.c - * - * @brief Test driver for psAbort function - * - * This test drivers contains the following test points for psAbort - * 2) String values in error message - * - * @author Eric Van Alst, MHPCC - * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-06 22:34:06 $ - * - * Copyright 2004 Maui High Performance Computing Center, University of Hawaii - */ - -#include "pslib.h" -#include "psTest.h" - -int main ( int argc, - char *argv[] - ) -{ - // Test point #2 String values in abort message - printPositiveTestHeader(stderr,"psAbort","String values in abort message"); - psAbort(PS_STRING(__LINE__), "NO_VALUES"); - // Since abort should never get to the next statement it would indicate - // a test failure - printFooter(stderr,"psAbort","String values in abort message",false); - - // Program execution should have ended before this statement but if it - // does not return a zero since the expected return value of this test - // is a non-zero value - return 0; -} - Index: unk/psLib/test/sysUtils/atst_psAbort_03.c =================================================================== --- /trunk/psLib/test/sysUtils/atst_psAbort_03.c (revision 1700) +++ (revision ) @@ -1,35 +1,0 @@ -/** @file atst_psAbort_02.c - * - * @brief Test driver for psAbort function - * - * This test drivers contains the following test points for psAbort - * 3) Empty strings in abort message - * - * @author Eric Van Alst, MHPCC - * - * @version $Revision: 1.3 $ $Name: not supported by cvs2svn $ - * @date $Date: 2004-08-06 22:34:06 $ - * - * Copyright 2004 Maui High Performance Computing Center, University of Hawaii - */ - -#include "pslib.h" -#include "psTest.h" - -int main ( int argc, - char *argv[] - ) -{ - // Test point #3 Empty strings in abort message - printPositiveTestHeader(stderr, "psAbort","Empty strings in abort message"); - psAbort("", ""); - // Since abort should never get to the next statement it would indicate - // a test failure - printFooter(stderr, "psAbort","Empty strings in abort message",false); - - // Program execution should have ended before this statement but if it - // does not return a zero since the expected return value of this test - // is a non-zero value - return 0; -} - Index: /trunk/psLib/test/sysUtils/tst_psAbort.c =================================================================== --- /trunk/psLib/test/sysUtils/tst_psAbort.c (revision 1701) +++ /trunk/psLib/test/sysUtils/tst_psAbort.c (revision 1701) @@ -0,0 +1,76 @@ +/** @file atst_psAbort_01.c + * + * @brief Test driver for psAbort function + * + * This test drivers contains the following test points for psAbort + * 1) Multiple type values in abort message + * + * @author Eric Van Alst, MHPCC + * + * @version $Revision: 1.1 $ $Name: not supported by cvs2svn $ + * @date $Date: 2004-09-07 21:26:13 $ + * + * Copyright 2004 Maui High Performance Computing Center, University of Hawaii + */ + +#include "pslib.h" +#include "psTest.h" + +static int testAbort00(void); +static int testAbort01(void); +static int testAbort02(void); + +testDescription tests[] = { + {testAbort00, 0, "Multiple type values in abort message", -6, false}, + {testAbort01, 1, "String values in abort message", -6, false}, + {testAbort02, 2, "Empty strings in abort message", -6, false}, + {NULL} + }; + +int main( int argc, char* argv[] ) +{ + psLogSetLevel( PS_LOG_INFO ); + + return ( ! runTestSuite( stderr, "psAbort", tests, argc, argv ) ); +} + +static int testAbort00(void) +{ + int intval = 1; + long longval = 2; + float floatval = 3.01; + char charval = 'E'; + char *stringval = "E R R O R"; + + // Test point #1 Multiple type values placed in the error string + psAbort(__func__, + "ALL TYPES intval = %d longval = %ld floatval = %f charval = %c strval = %s", + intval, longval, floatval, charval, stringval ); + + // Program execution should have ended before this statement but if it + // does not return a zero since the expected return value of this test + // is a non-zero value + return 0; +} + +static int testAbort01(void) +{ + // Test point #2 String values in abort message + psAbort(PS_STRING(__LINE__), "NO_VALUES"); + + // Program execution should have ended before this statement but if it + // does not return a zero since the expected return value of this test + // is a non-zero value + return 0; +} + +static int testAbort02(void) +{ + // Test point #2 String values in abort message + psAbort("",""); + + // Program execution should have ended before this statement but if it + // does not return a zero since the expected return value of this test + // is a non-zero value + return 0; +} Index: unk/psLib/test/sysUtils/verified/atst_psAbort_01.stderr =================================================================== --- /trunk/psLib/test/sysUtils/verified/atst_psAbort_01.stderr (revision 1700) +++ (revision ) @@ -1,7 +1,0 @@ -/***************************** TESTPOINT ******************************************\ -* TestFile: atst_psAbort_01.c * -* TestPoint: psAbort{Multiple type values in abort message} * -* TestType: Positive * -\**********************************************************************************/ - -