[kaffe] CVS kaffe (guilhem): Weak test fixlet.

Kaffe CVS cvs-commits at kaffe.org
Mon Aug 1 14:02:51 PDT 2005


PatchSet 6775 
Date: 2005/08/01 20:53:36
Author: guilhem
Branch: HEAD
Tag: (none) 
Log:
Weak test fixlet.

        * test/jni/Makefile.am: Fixed typo.

        * test/jni/Makefile.in: Regenerated.

        * test/jni/jniWeakTest.c
        (main): Register preloaded symbols.

Members: 
	ChangeLog:1.4300->1.4301 
	test/jni/Makefile.am:1.8->1.9 
	test/jni/Makefile.in:1.39->1.40 
	test/jni/jniWeakTest.c:1.1->1.2 

Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.4300 kaffe/ChangeLog:1.4301
--- kaffe/ChangeLog:1.4300	Mon Aug  1 20:50:51 2005
+++ kaffe/ChangeLog	Mon Aug  1 20:53:36 2005
@@ -1,5 +1,14 @@
 2005-08-01  Guilhem Lavaux <guilhem at kaffe.org>
 
+	* test/jni/Makefile.am: Fixed typo.
+
+	* test/jni/Makefile.in: Regenerated.
+
+	* test/jni/jniWeakTest.c
+	(main): Register preloaded symbols.
+
+2005-08-01  Guilhem Lavaux <guilhem at kaffe.org>
+
 	* test/internal/VirtualMethod.java: New test.
 
 	* test/internal/Makefile.am: Added the test.
Index: kaffe/test/jni/Makefile.am
diff -u kaffe/test/jni/Makefile.am:1.8 kaffe/test/jni/Makefile.am:1.9
--- kaffe/test/jni/Makefile.am:1.8	Tue Jul 12 23:50:52 2005
+++ kaffe/test/jni/Makefile.am	Mon Aug  1 20:53:44 2005
@@ -106,7 +106,7 @@
         $(LTLIBINTL) \
 	@LIBLTDL@
 
-jniWeakTest_DEPENDECIES = $(LIBKAFFEVM) libjniweaklib.la
+jniWeakTest_DEPENDENCIES = $(LIBKAFFEVM) libjniweaklib.la
 
 jniWeakTest.o: JNIWeakTest.class
 
Index: kaffe/test/jni/Makefile.in
diff -u kaffe/test/jni/Makefile.in:1.39 kaffe/test/jni/Makefile.in:1.40
--- kaffe/test/jni/Makefile.in:1.39	Tue Jul 19 01:16:54 2005
+++ kaffe/test/jni/Makefile.in	Mon Aug  1 20:53:44 2005
@@ -95,9 +95,6 @@
 jniReflect_OBJECTS = $(am_jniReflect_OBJECTS)
 am_jniWeakTest_OBJECTS = jniWeakTest.$(OBJEXT)
 jniWeakTest_OBJECTS = $(am_jniWeakTest_OBJECTS)
-jniWeakTest_DEPENDENCIES = $(top_builddir)/test/jni/libjniweaklib.la \
-	$(am__DEPENDENCIES_1) $(am__DEPENDENCIES_4) \
-	$(am__DEPENDENCIES_5) $(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)/config
 depcomp = $(SHELL) $(top_srcdir)/scripts/depcomp
 am__depfiles_maybe = depfiles
@@ -476,7 +473,7 @@
         $(LTLIBINTL) \
 	@LIBLTDL@
 
-jniWeakTest_DEPENDECIES = $(LIBKAFFEVM) libjniweaklib.la
+jniWeakTest_DEPENDENCIES = $(LIBKAFFEVM) libjniweaklib.la
 EXTRA_DIST = \
 	JNIWeakTest.java \
 	HelloWorldApp.class
Index: kaffe/test/jni/jniWeakTest.c
diff -u kaffe/test/jni/jniWeakTest.c:1.1 kaffe/test/jni/jniWeakTest.c:1.2
--- kaffe/test/jni/jniWeakTest.c:1.1	Tue Jul 12 23:50:52 2005
+++ kaffe/test/jni/jniWeakTest.c	Mon Aug  1 20:53:45 2005
@@ -36,6 +36,9 @@
   jmethodID mainid;
 
   /* set up libtool/libltdl dlopen emulation */
+  LTDL_SET_PRELOADED_SYMBOLS();
+
+  /* set up libtool/libltdl dlopen emulation */
   myoptions[0].optionString = concatString("-Xbootclasspath:", getenv("BOOTCLASSPATH"));
   myoptions[1].optionString = concatString("-Xclasspath:", CLASSPATH_SOURCE_DIR);  
   myoptions[2].optionString = "-Xvmdebug:NATIVELIB";  



More information about the kaffe mailing list