Add support for reporting errors and warnings in dejagnu.h

4 files changed, 18 insertions, 0 deletions

diff --git a/testsuite/libdejagnu/harness.exp b/testsuite/libdejagnu/harness.exp
index 34da7b4..c3ec3f5 100644
--- a/testsuite/libdejagnu/harness.exp
+++ b/testsuite/libdejagnu/harness.exp
@@ -88,6 +88,8 @@ proc test_libdejagnu_unit { language tests } {
 		    untested	{ set expected UNTESTED    }
 		    unresolved	{ set expected UNRESOLVED  }
 		    unsupported { set expected UNSUPPORTED }
+		    warning	{ set expected WARNING     }
+		    error	{ set expected ERROR       }
 		}
 		if { [info exists expected_totals([lindex $test $test_idx])]} {
 		    incr expected_totals([lindex $test $test_idx])
@@ -134,6 +136,8 @@ proc test_libdejagnu_unit { language tests } {
 foreach language {c cxx} {
     test_libdejagnu_unit $language {
 	note pass fail xpass xfail untested unresolved unsupported
+	{error pass} {error fail} {error xpass} {error xfail}
+	{warning pass} {warning fail} {warning xpass} {warning xfail}
     }
 }
 
@@ -141,4 +145,10 @@ test_libdejagnu_unit ccxxmix {
     {pass pass xpass xfail xfail xpass}
     {fail fail xfail xpass xpass xfail}
     {untested unresolved unsupported untested unresolved unsupported}
+    {error pass} {error fail} {error xpass} {error xfail}
+    {warning pass} {warning fail} {warning xpass} {warning xfail}
+    {note error pass} {note error fail}
+    {note error xpass} {note error xfail}
+    {note warning pass} {note warning fail}
+    {note warning xpass} {note warning xfail}
 }
diff --git a/testsuite/libdejagnu/unit-c.c b/testsuite/libdejagnu/unit-c.c
index 1265b70..ef5c973 100644
--- a/testsuite/libdejagnu/unit-c.c
+++ b/testsuite/libdejagnu/unit-c.c
@@ -47,6 +47,8 @@ main(int argc, char ** argv)
     else if (!strcmp("unresolved", argv[i]))	unresolved("test");
     else if (!strcmp("unsupported", argv[i]))	unsupported("test");
     else if (!strcmp("note", argv[i]))		note("test");
+    else if (!strcmp("error", argv[i]))		DG_error("test");
+    else if (!strcmp("warning", argv[i]))	DG_warning("test");
     else {
       fprintf(stderr, "%s: unknown test `%s'\n", argv[0], argv[i]);
       return 2;
diff --git a/testsuite/libdejagnu/unit-ccxxmix.cxx b/testsuite/libdejagnu/unit-ccxxmix.cxx
index a57b073..5116f36 100644
--- a/testsuite/libdejagnu/unit-ccxxmix.cxx
+++ b/testsuite/libdejagnu/unit-ccxxmix.cxx
@@ -52,6 +52,8 @@ main(int argc, char ** argv)
       else if (!std::strcmp("unresolved", argv[i]))   DGT.unresolved("test");
       else if (!std::strcmp("unsupported", argv[i]))  DGT.unsupported("test");
       else if (!std::strcmp("note", argv[i]))         DGT.note("test");
+      else if (!std::strcmp("error", argv[i]))	      DGT.error("test");
+      else if (!std::strcmp("warning", argv[i]))      DGT.warning("test");
       else {
 	std::cerr <<argv[0] <<": unknown test `" <<argv[i] <<"'" <<std::endl;
 	return 2;
@@ -65,6 +67,8 @@ main(int argc, char ** argv)
       else if (!strcmp("unresolved", argv[i]))        unresolved("test");
       else if (!strcmp("unsupported", argv[i]))       unsupported("test");
       else if (!strcmp("note", argv[i]))              note("test");
+      else if (!strcmp("error", argv[i]))             DG_error("test");
+      else if (!strcmp("warning", argv[i]))           DG_warning("test");
       else {
 	fprintf(stderr, "%s: unknown test `%s'\n", argv[0], argv[i]);
 	return 2;
diff --git a/testsuite/libdejagnu/unit-cxx.cxx b/testsuite/libdejagnu/unit-cxx.cxx
index fecf550..aa229d0 100644
--- a/testsuite/libdejagnu/unit-cxx.cxx
+++ b/testsuite/libdejagnu/unit-cxx.cxx
@@ -45,6 +45,8 @@ main(int argc, char ** argv)
     else if (!std::strcmp("unresolved", argv[i]))   DGT.unresolved("test");
     else if (!std::strcmp("unsupported", argv[i]))  DGT.unsupported("test");
     else if (!std::strcmp("note", argv[i]))	    DGT.note("test");
+    else if (!std::strcmp("error", argv[i]))	    DGT.error("test");
+    else if (!std::strcmp("warning", argv[i]))	    DGT.warning("test");
     else {
       std::cerr <<argv[0] <<": " <<"unknown test `" <<argv[i] <<"'" <<std::endl;
       return 2;