more work

From-SVN: r37926

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index b29f8ca8f8f53482fccc1832f434621c70b01847..d718f1d7a8648af7dce4c2d1499c6955590bf6fc 100644 (file)
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -942,6 +942,7 @@ java/util/EventListener.java \
 java/util/EventObject.java \
 java/util/GregorianCalendar.java \
 java/util/HashMap.java \
+java/util/HashSet.java \
 java/util/Hashtable.java \
 java/util/Iterator.java        \
 java/util/LinkedList.java \
@@ -969,6 +970,8 @@ java/util/TimeZone.java     \
 java/util/Timer.java \
 java/util/TimerTask.java \
 java/util/TooManyListenersException.java \
+java/util/TreeMap.java \
+java/util/TreeSet.java \
 java/util/Vector.java
 
 

diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index ba03af656b1a63fd68679093169f0f0f35bfde0d..eb84e551ad688cf95f8ed138f2101f165af1cbc5 100644 (file)
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -710,6 +710,7 @@ java/util/EventListener.java \
 java/util/EventObject.java \
 java/util/GregorianCalendar.java \
 java/util/HashMap.java \
+java/util/HashSet.java \
 java/util/Hashtable.java \
 java/util/Iterator.java        \
 java/util/LinkedList.java \
@@ -737,6 +738,8 @@ java/util/TimeZone.java     \
 java/util/Timer.java \
 java/util/TimerTask.java \
 java/util/TooManyListenersException.java \
+java/util/TreeMap.java \
+java/util/TreeSet.java \
 java/util/Vector.java
 
 
@@ -1680,11 +1683,11 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/util/EmptyStackException.P .deps/java/util/Enumeration.P \
 .deps/java/util/EventListener.P .deps/java/util/EventObject.P \
 .deps/java/util/GregorianCalendar.P .deps/java/util/HashMap.P \
-.deps/java/util/Hashtable.P .deps/java/util/Iterator.P \
-.deps/java/util/LinkedList.P .deps/java/util/List.P \
-.deps/java/util/ListIterator.P .deps/java/util/ListResourceBundle.P \
-.deps/java/util/Locale.P .deps/java/util/Map.P \
-.deps/java/util/MissingResourceException.P \
+.deps/java/util/HashSet.P .deps/java/util/Hashtable.P \
+.deps/java/util/Iterator.P .deps/java/util/LinkedList.P \
+.deps/java/util/List.P .deps/java/util/ListIterator.P \
+.deps/java/util/ListResourceBundle.P .deps/java/util/Locale.P \
+.deps/java/util/Map.P .deps/java/util/MissingResourceException.P \
 .deps/java/util/NoSuchElementException.P .deps/java/util/Observable.P \
 .deps/java/util/Observer.P .deps/java/util/Properties.P \
 .deps/java/util/PropertyPermission.P \
@@ -1694,7 +1697,8 @@ DEP_FILES =  .deps/$(srcdir)/$(CONVERT_DIR)/gen-from-JIS.P \
 .deps/java/util/SortedSet.P .deps/java/util/Stack.P \
 .deps/java/util/StringTokenizer.P .deps/java/util/TimeZone.P \
 .deps/java/util/Timer.P .deps/java/util/TimerTask.P \
-.deps/java/util/TooManyListenersException.P .deps/java/util/Vector.P \
+.deps/java/util/TooManyListenersException.P .deps/java/util/TreeMap.P \
+.deps/java/util/TreeSet.P .deps/java/util/Vector.P \
 .deps/java/util/jar/Attributes.P .deps/java/util/jar/JarEntry.P \
 .deps/java/util/jar/JarException.P .deps/java/util/jar/JarFile.P \
 .deps/java/util/jar/JarInputStream.P \

diff --git a/libjava/testsuite/ChangeLog b/libjava/testsuite/ChangeLog
index c7992c0865cb4af8a75e318a719d91a68ef83107..0c369e6c696798818e74f84289c12397cc4172ec 100644 (file)
--- a/libjava/testsuite/ChangeLog
+++ b/libjava/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2000-11-30  Tom Tromey  <tromey@cygnus.com>
+
+       * libjava.lang/instinit.java: Don't extend `foo'.
+
 2000-11-26  Tom Tromey  <tromey@cygnus.com>
 
        * libjava.compile/weirddecl.java: New file.

diff --git a/libjava/testsuite/libjava.lang/instinit.java b/libjava/testsuite/libjava.lang/instinit.java
index 9a02b6699bc0c6cccf4009bf867f33295ab35a8d..a72dc10db122fc5a7f871f801ff70366d8474689 100644 (file)
--- a/libjava/testsuite/libjava.lang/instinit.java
+++ b/libjava/testsuite/libjava.lang/instinit.java
@@ -2,7 +2,7 @@
 // Generated on Wed Feb  2 12:31:16 PST 2000
 // Simple instance initializer test case.
 
-class instinit extends foo {
+class instinit {
 
     String buffer = "No Oink! Oink!";