incubator-kato-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From spo...@apache.org
Subject svn commit: r888373 - in /incubator/kato/trunk/org.apache.kato/kato.native: kato.native.cjvmti/linux-x86/pom.xml kato.native.vmapi/linux-x86/pom.xml kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java
Date Tue, 08 Dec 2009 12:32:20 GMT
Author: spoole
Date: Tue Dec  8 12:32:20 2009
New Revision: 888373

URL: http://svn.apache.org/viewvc?rev=888373&view=rev
Log:
fixed problem with load libary test failing when it picked up the wrong lib

Modified:
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/linux-x86/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/linux-x86/pom.xml
    incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java

Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/linux-x86/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/linux-x86/pom.xml?rev=888373&r1=888372&r2=888373&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/linux-x86/pom.xml
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.cjvmti/linux-x86/pom.xml
Tue Dec  8 12:32:20 2009
@@ -43,7 +43,7 @@
         <extensions>true</extensions>   
         <configuration>
           <compilerStartOptions>
-            <compilerStartOption>-fPIC -O0 -ggdb3</compilerStartOption>
+            <compilerStartOption>-fPIC -O0 -ggdb3 -m32 -shared</compilerStartOption>
           </compilerStartOptions>
           
           <javahOS>linux</javahOS>

Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/linux-x86/pom.xml
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/linux-x86/pom.xml?rev=888373&r1=888372&r2=888373&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/linux-x86/pom.xml (original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/linux-x86/pom.xml Tue
Dec  8 12:32:20 2009
@@ -50,7 +50,7 @@
 				<configuration>
 
 					<compilerStartOptions>
-						<compilerStartOption>-fPIC -O</compilerStartOption>
+						<compilerStartOption>-fPIC -O -m32 -shared</compilerStartOption>
 					</compilerStartOptions>
 
 					<javahOS>linux</javahOS>

Modified: incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java
URL: http://svn.apache.org/viewvc/incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java?rev=888373&r1=888372&r2=888373&view=diff
==============================================================================
--- incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java
(original)
+++ incubator/kato/trunk/org.apache.kato/kato.native/kato.native.vmapi/tests/src/test/java/test/apache/kato/vmapi/TestLibraryLoad.java
Tue Dec  8 12:32:20 2009
@@ -44,7 +44,10 @@
 		File[] kids=dir.listFiles();
 		for(File kid:dir.listFiles()) {
 			String name=kid.getName();
-			if(name.contains("katovmapi")) return kid.getAbsolutePath();
+			// we expect lib or dlls
+			
+			if(name.startsWith("libkatovmapi")) return kid.getAbsolutePath();
+			if(name.equals("katovmapi.dll")) return kid.getAbsolutePath();
 		}
 		 throw new RuntimeException("system property libloc location does not hold a file matching
*katovmapi* [libloc="+location+"]");
 		



Mime
View raw message