Updated per trace code review comments.

- Fixed merge issue with src/makefile
- Updated per second code review
- Got trace tests up and running

Change-Id: I932ac4eb6d2389e39ce5efb1dd2f5cfa97f7b70b
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>
Reviewed-by: Andrew J. Geissler <andrewg@us.ibm.com>

1 files changed, 23 insertions, 0 deletions

diff --git a/src/usr/example/test/exampletest.H b/src/usr/example/test/exampletest.H
index c45aaf4f7..ec2e60dba 100644
--- a/src/usr/example/test/exampletest.H
+++ b/src/usr/example/test/exampletest.H
@@ -1,9 +1,22 @@
+#ifndef __TEST_EXAMPLETEST_H
+#define __TEST_EXAMPLETEST_H
+
+/**
+ *  @file exampletest.H
+ *
+ *  @brief Example for people to use when writing test cases for their module.
+*/
+
 #include <cxxtest/TestSuite.H>
 #include <example/example.H>
 
 class ExampleTest: public CxxTest::TestSuite
 {
 public:
+
+    /**
+     * @test Test Description
+     */
     void testExample1(void)
     {
         uint64_t    l_rc = 0;
@@ -13,11 +26,19 @@ public:
             TS_FAIL("Call to example1_function1 failed!");
         }
     }
+
+    /**
+     * @test Test Description
+     */
     void testExample2(void)
     {
         // Call functions and validate results
         // TS_FAIL("Failed test call to example2 function");
     }
+
+    /**
+     * @test Test Description
+     */
     void testExample3(void)
     {
         // Call functions and validate results
@@ -36,3 +57,5 @@ public:
 
 };
 
+#endif
+