diff options
author | Patrick Williams <iawillia@us.ibm.com> | 2013-11-13 14:22:51 -0600 |
---|---|---|
committer | A. Patrick Williams III <iawillia@us.ibm.com> | 2013-11-14 15:01:05 -0600 |
commit | 7128a4586656f1c9cdcf95b2e42080c9ae195bc3 (patch) | |
tree | 935c289184231290a3261d4e1aafcc545a0a7f6c /src/usr | |
parent | 9a6797492fe16ae9ce2bfb71760c122953879095 (diff) | |
download | talos-hostboot-7128a4586656f1c9cdcf95b2e42080c9ae195bc3.tar.gz talos-hostboot-7128a4586656f1c9cdcf95b2e42080c9ae195bc3.zip |
Remove console.H from CxxTest driver include.
Change-Id: Ifd3003cc05cdb2ecd91824250c56e9cec62eaa75
Reviewed-on: http://gfw160.austin.ibm.com:8080/gerrit/7232
Tested-by: Jenkins Server
Reviewed-by: MIKE J. JONES <mjjones@us.ibm.com>
Reviewed-by: Donald E. Dahle <dedahle@us.ibm.com>
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Diffstat (limited to 'src/usr')
-rwxr-xr-x | src/usr/cxxtest/TestSuite.C | 3 | ||||
-rwxr-xr-x | src/usr/cxxtest/cxxtestgen.pl | 8 | ||||
-rw-r--r-- | src/usr/pnor/test/ecctest.H | 1 | ||||
-rw-r--r-- | src/usr/testcore/kernel/ptmgrtest.H | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/src/usr/cxxtest/TestSuite.C b/src/usr/cxxtest/TestSuite.C index bdd03244f..cb187950d 100755 --- a/src/usr/cxxtest/TestSuite.C +++ b/src/usr/cxxtest/TestSuite.C @@ -29,7 +29,6 @@ #include <limits.h> #include <stdarg.h> #include <arch/ppc.H> -#include <kernel/console.H> #include <cxxtest/TestSuite.H> @@ -135,8 +134,6 @@ void reportTotalTests( const char *suitename, TRACDCOMP( g_trac_test, "Suite %s Completed ", suitename ); - // printk( "%s completed %ld tests\n", suitename, numtests); - return; } diff --git a/src/usr/cxxtest/cxxtestgen.pl b/src/usr/cxxtest/cxxtestgen.pl index f38c91aa6..cb24ccbd5 100755 --- a/src/usr/cxxtest/cxxtestgen.pl +++ b/src/usr/cxxtest/cxxtestgen.pl @@ -636,7 +636,7 @@ sub writeHostBootPreamble() { ## print the standard includes for Hostboot print "\n"; - print "#include <kernel/console.H>\n"; + print "#include <kernel/console.H>\n" if ($debug); print "#include <sys/sync.h>\n"; print "#include <sys/vfs.h>\n"; print "#include <sys/task.h>\n"; @@ -694,7 +694,11 @@ sub writeHostBootSuites() { ## run each of the tests in the list foreach (@{suiteTests()}) { $test = $_; - print "\tprintkd(\"CxxTest: Executing ", suiteName(), " ", testName(), ".\\n\");\n"; + if ( $debug ) + { + print "\tprintkd(\"CxxTest: Executing ", suiteName(), " ", + testName(), ".\\n\");\n"; + } printf "\t$suitevar->%s();\n\n", testName(); $testcount++; } diff --git a/src/usr/pnor/test/ecctest.H b/src/usr/pnor/test/ecctest.H index 5a559b528..f4978df95 100644 --- a/src/usr/pnor/test/ecctest.H +++ b/src/usr/pnor/test/ecctest.H @@ -23,6 +23,7 @@ #include <cxxtest/TestSuite.H> #include <pnor/ecc.H> #include <stdlib.h> +#include <string.h> // Forward declarations, see ecc.C namespace PNOR diff --git a/src/usr/testcore/kernel/ptmgrtest.H b/src/usr/testcore/kernel/ptmgrtest.H index 635901318..f5d0d1eb4 100644 --- a/src/usr/testcore/kernel/ptmgrtest.H +++ b/src/usr/testcore/kernel/ptmgrtest.H @@ -5,7 +5,7 @@ /* */ /* IBM CONFIDENTIAL */ /* */ -/* COPYRIGHT International Business Machines Corp. 2011,2012 */ +/* COPYRIGHT International Business Machines Corp. 2011,2013 */ /* */ /* p1 */ /* */ @@ -31,6 +31,7 @@ #include <arch/ppc.H> #include <sys/time.h> #include <kernel/ptmgr.H> +#include <kernel/console.H> //#define PASS_TRACE(args...) TS_TRACE(args) #define PASS_TRACE(args...) |