From 0cd7f332b5f05b0f54b2166441abe9112ea3b768 Mon Sep 17 00:00:00 2001 From: Ben Elliston Date: Fri, 6 Feb 2004 13:12:08 +0000 Subject: * dejagnu.h: Conform with GNU coding standard. --- dejagnu.h | 292 ++++++++++++++++++++++++++++---------------------------------- 1 file changed, 132 insertions(+), 160 deletions(-) (limited to 'dejagnu.h') diff --git a/dejagnu.h b/dejagnu.h index 908fb38..c4fb903 100644 --- a/dejagnu.h +++ b/dejagnu.h @@ -1,5 +1,5 @@ /* - * Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. + * Copyright (C) 2000, 2001, 2002, 2004 Free Software Foundation, Inc. * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -23,7 +23,7 @@ #include #include -/* If you have problems with dejagnu dropping failed, untested, or +/* If you have problems with DejaGnu dropping failed, untested, or * unresolved messages generated by a unit testcase, */ @@ -47,246 +47,218 @@ static char buffer[ _BUFFER_SIZE_ ]; #ifdef _DEJAGNU_WAIT_ void -wait(void) { - fd_set rfds; - struct timeval tv; - - FD_ZERO(&rfds); - tv.tv_sec = 0; - tv.tv_usec = 1; - - select(0, &rfds, NULL, NULL, &tv); +wait (void) +{ + fd_set rfds; + struct timeval tv; + + FD_ZERO (&rfds); + tv.tv_sec = 0; + tv.tv_usec = 1; + + select (0, &rfds, NULL, NULL, &tv); } #endif inline void -pass (const char* fmt, ... ) { - va_list ap; +pass (const char* fmt, ...) +{ + va_list ap; - passed++; - va_start( ap, fmt ); - vsnprintf( buffer, _BUFFER_SIZE_, fmt, ap ); - va_end( ap ); - printf ("\tPASSED: %s\n", buffer ); + passed++; + va_start (ap, fmt); + vsnprintf (buffer, _BUFFER_SIZE_, fmt, ap); + va_end (ap); + printf ("\tPASSED: %s\n", buffer); #ifdef _DEJAGNU_WAIT_ - wait(); + wait (); #endif } inline void -fail (const char* fmt, ... ) { - va_list ap; - - failed++; - va_start( ap, fmt ); - vsnprintf( buffer, _BUFFER_SIZE_, fmt, ap ); - va_end( ap ); - printf ("\tFAILED: %s\n", buffer ); +fail (const char* fmt, ...) +{ + va_list ap; + + failed++; + va_start (ap, fmt); + vsnprintf (buffer, _BUFFER_SIZE_, fmt, ap); + va_end (ap); + printf ("\tFAILED: %s\n", buffer); #ifdef _DEJAGNU_WAIT_ - wait(); + wait (); #endif } inline void -untested (const char* fmt, ... ) { - va_list ap; - - untest++; - va_start( ap, fmt ); - vsnprintf( buffer, _BUFFER_SIZE_, fmt, ap ); - va_end( ap ); - printf ("\tUNTESTED: %s\n", buffer ); +untested (const char* fmt, ...) +{ + va_list ap; + + untest++; + va_start (ap, fmt); + vsnprintf (buffer, _BUFFER_SIZE_, fmt, ap); + va_end (ap); + printf ("\tUNTESTED: %s\n", buffer); #ifdef _DEJAGNU_WAIT_ - wait(); + wait (); #endif } inline void -unresolved (const char* fmt, ... ) { - va_list ap; - - unresolve++; - va_start( ap, fmt ); - vsnprintf( buffer, _BUFFER_SIZE_, fmt, ap ); - va_end( ap ); - printf ("\tUNRESOLVED: %s\n", buffer ); +unresolved (const char* fmt, ...) +{ + va_list ap; + + unresolve++; + va_start (ap, fmt); + vsnprintf (buffer, _BUFFER_SIZE_, fmt, ap); + va_end (ap); + printf ("\tUNRESOLVED: %s\n", buffer); #ifdef _DEJAGNU_WAIT_ - wait(); + wait (); #endif } inline void -note (const char* fmt, ... ) { - va_list ap; - - va_start( ap, fmt ); - vsnprintf( buffer, _BUFFER_SIZE_, fmt, ap ); - va_end( ap ); - printf ("\tNOTE: %s\n", buffer ); +note (const char* fmt, ...) +{ + va_list ap; + + va_start (ap, fmt); + vsnprintf (buffer, _BUFFER_SIZE_, fmt, ap); + va_end (ap); + printf ("\tNOTE: %s\n", buffer); #ifdef _DEJAGNU_WAIT_ - wait(); + wait (); #endif } inline void -totals (void) { - printf ("\nTotals:\n"); - printf ("\t#passed:\t\t%d\n", passed); - printf ("\t#failed:\t\t%d\n", failed); - if (untest) - printf ("\t#untested:\t\t%d\n", untest); - if (unresolve) - printf ("\t#unresolved:\t\t%d\n", unresolved); +totals (void) +{ + printf ("\nTotals:\n"); + printf ("\t#passed:\t\t%d\n", passed); + printf ("\t#failed:\t\t%d\n", failed); + if (untest) + printf ("\t#untested:\t\t%d\n", untest); + if (unresolve) + printf ("\t#unresolved:\t\t%d\n", unresolved); } #ifdef __cplusplus - #include #include #include #include -#if 0 -#ifdef __STDC___ -#include -#else -#include -#endif -#endif const char *outstate_list[] = { - "FAILED: ", - "PASSED: ", - "UNTESTED: ", - "UNRESOLVED: " + "FAILED: ", "PASSED: ", "UNTESTED: ", "UNRESOLVED: " }; const char ** outstate = outstate_list; -#if 0 -extern ios& __iomanip_testout (ios&, int); -inline smanip testout (int n) { - return smanip (__iomanip_testout, n); -} -ios & __iomanip_testout (ios& i, int x) { - return i; -} - -template -class OMANIP { - private: - T i; - ostream &(*f)(ostream&, T); - public: - OMANIP(ostream& (*ff)(ostream&, T), T ii) : f(ff), i(ii) { - } - friend ostream operator<<(ostream& us, OMANIP& m) { - return m.f(os,m.i); - } -}; - -ostream& -freakout(ostream& os, int x) { - return os << "FREAKOUT" ; -// return x << "TESTOUT " << x ; -} - -OMANIP testout(int i) { - return OMANIP(&freakout,i); -} -#endif - enum teststate {FAILED, PASSED,UNTESTED,UNRESOLVED} laststate; class TestState { private: - teststate laststate; - std::string lastmsg; + teststate laststate; + std::string lastmsg; public: - TestState(void) { - passed = 0; - failed = 0; - untest = 0; - unresolve = 0; + TestState (void) + { + passed = 0; + failed = 0; + untest = 0; + unresolve = 0; } - ~TestState(void) { - totals(); - }; - - void testrun (bool b, std::string s) { - if (b) - pass (s); - else - fail (s); + + ~TestState (void) { totals(); } + + void testrun (bool b, std::string s) + { + if (b) + pass (s); + else + fail (s); } - void pass (std::string s) { + void pass (std::string s) + { passed++; laststate = PASSED; lastmsg = s; std::cout << "\t" << outstate[PASSED] << s << std::endl; - } - void pass (const char *c) { - std::string s = c; + } + + void pass (const char *c) + { + std::string s = c; pass (s); - } + } - void fail (std::string s) { + void fail (std::string s) + { failed++; laststate = FAILED; lastmsg = s; std::cout << "\t" << outstate[FAILED] << s << std::endl; - } - void fail (const char *c) { + } + + void fail (const char *c) + { std::string s = c; fail (s); - } + } - void untested (std::string s) { + void untested (std::string s) + { untest++; laststate = UNTESTED; lastmsg = s; std::cout << "\t" << outstate[UNTESTED] << s << std::endl; - } - void untested (const char *c) { + } + + void untested (const char *c) + { std::string s = c; untested (s); - } - - void unresolved (std::string s) { + } + + void unresolved (std::string s) + { unresolve++; laststate = UNRESOLVED; lastmsg = s; std::cout << "\t" << outstate[UNRESOLVED] << s << std::endl; - } - void unresolved (const char *c) { + } + + void unresolved (const char *c) + { std::string s = c; unresolved (s); - } + } - void totals (void) { + void totals (void) + { std::cout << "\t#passed:\t\t" << passed << std::endl; std::cout << "\t#failed:\t\t" << failed << std::endl; if (untest) - std::cout << "\t#untested:\t\t" << untest << std::endl; + std::cout << "\t#untested:\t\t" << untest << std::endl; if (unresolve) - std::cout << "\t#unresolved:\t\t" << unresolve << std::endl; - } - + std::cout << "\t#unresolved:\t\t" << unresolve << std::endl; + } + // This is so this class can be printed in an ostream. - friend std::ostream & operator << (std::ostream &os, TestState& t) { - return os << "\t" << outstate[t.laststate] << t.lastmsg ; - } - - int GetState(void) { - return laststate; - } - std::string GetMsg(void) { - return lastmsg; - } + friend std::ostream & operator << (std::ostream &os, TestState& t) + { + return os << "\t" << outstate[t.laststate] << t.lastmsg ; + } + + int GetState (void) { return laststate; } + std::string GetMsg (void) { return lastmsg; } }; -#endif // __cplusplus -#endif // _DEJAGNU_H_ - - +#endif // __cplusplus +#endif // _DEJAGNU_H_ -- cgit v1.1