aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog39
-rw-r--r--dejagnu.h4
-rw-r--r--testsuite/libdejagnu/unit.cc6
3 files changed, 45 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 9c52815..f1838d8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,42 @@
+2001-07-30 Paul A. Houghton <houghton@wcomnet.com>
+
+ * dejagnu.h, testsuite/libdejagnu/unit.cc: Make the oustate array
+ be a const to work with Sun's compiler.
+
+2001-07-17 Jason Merrill <jason_merrill@redhat.com>
+
+ * lib/utils.exp (runtest_file_p): An argument can match trailing
+ directories as well as the basename.
+
+2001-06-08 John Cotton <john.cotton@nrc.ca>
+
+ * testglue.c:
+ * lib/remote.exp:
+ * lib/standard.exp:
+ * lib/target.exp:
+ * lib/utils.exp:
+ * baseboards/mbx821_001.exp:
+ * baseboards/mbx860_002.exp:
+ * baseboards/mbx8xx.exp:
+ * baseboards/mvme167.exp:
+ Added support for automated testing of RTEMS targets,
+ specifically the mbx821, mbx860 and mvme167.
+
+2001-06-08 John Cotton <john.cotton@nrc.ca>
+
+ */lib/libgloss.exp: fixed regexp bug.
+
+2001-05-30 Jeffrey Oldham <oldham@codesourcery.com>
+
+ * doc/dejagnu.texi: Fix typographical errors.
+ * doc/ref.sgml: Likewise.
+ * doc/user.sgml: Likewise.
+
+2001-05-30 Rob Savoye <rob@peggyo.welcomehome.org>
+
+ * dejagnu.h: Remove the iostream headers, so now we have no
+ conditional compilation problems with libstdc++-v3 or v2.
+
2001-05-28 Rob Savoye <rob@peggyo.welcomehome.org>
* acinclude.m4(DJ_AC_STL): Also use
diff --git a/dejagnu.h b/dejagnu.h
index 919a469..6efd6bf 100644
--- a/dejagnu.h
+++ b/dejagnu.h
@@ -76,13 +76,15 @@ totals (void) {
#endif
#endif
-char *outstate[] = {
+const char *outstate_list[] = {
"FAILED: ",
"PASSED: ",
"UNTESTED: ",
"UNRESOLVED: "
};
+const char ** outstate = outstate_list;
+
#if 0
extern ios& __iomanip_testout (ios&, int);
inline smanip<int> testout (int n) {
diff --git a/testsuite/libdejagnu/unit.cc b/testsuite/libdejagnu/unit.cc
index 6f3918a..d01869a 100644
--- a/testsuite/libdejagnu/unit.cc
+++ b/testsuite/libdejagnu/unit.cc
@@ -1,11 +1,11 @@
// unit.cc -- This is a test case for the Dejagnu.h classes.
+#include <sys/types.h>
#include <iostream>
#include <regex.h>
#include <string>
#include <fstream>
#include <set>
-#include <sys/types.h>
#include <dejagnu.h>
using namespace std;
@@ -25,14 +25,14 @@ TestClass1 *testClassPtr;
// We have to so this silly crap with renaming the output string, so the generic
// Tcl code that looks for the output state gets confused, and records random
// duplicate messages.
-char *os1[] = {
+const char *os1[] = {
"FAI: ",
"PAS: ",
"UNT: ",
"UNR: "
};
-char *os2[] = {
+const char *os2[] = {
"FAILED: ",
"PASSED: ",
"UNTESTED: ",