harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hinde...@apache.org
Subject svn commit: r544145 - in /harmony/enhanced/classlib/trunk: make/ modules/portlib/ modules/portlib/src/test/native/hyerror/unix/ modules/portlib/src/test/native/hyfile/unix/ modules/portlib/src/test/native/hytime/shared/ modules/portlib/src/test/native/...
Date Mon, 04 Jun 2007 12:50:55 GMT
Author: hindessm
Date: Mon Jun  4 05:50:51 2007
New Revision: 544145

URL: http://svn.apache.org/viewvc?view=rev&rev=544145
Log:
Trying to get portlib tests to run when hy.no.thr=true.

Modified:
    harmony/enhanced/classlib/trunk/make/properties.xml
    harmony/enhanced/classlib/trunk/modules/portlib/build.xml
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/shared/hytime.c
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile
    harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile

Modified: harmony/enhanced/classlib/trunk/make/properties.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/make/properties.xml?view=diff&rev=544145&r1=544144&r2=544145
==============================================================================
--- harmony/enhanced/classlib/trunk/make/properties.xml (original)
+++ harmony/enhanced/classlib/trunk/make/properties.xml Mon Jun  4 05:50:51 2007
@@ -188,6 +188,11 @@
     </condition>
     <property name="exe.suffix" value="" />
 
+    <condition property="shlib.prefix" value="">
+        <isset property="is.windows"/>
+    </condition>
+    <property name="shlib.prefix" value="lib" />
+
     <condition property="shlib.suffix" value=".dll">
         <isset property="is.windows"/>
     </condition>
@@ -343,6 +348,7 @@
   is.s390x = ${is.s390x}
 
   exe.suffix = ${exe.suffix}
+  shlib.prefix = ${shlib.prefix}
   shlib.suffix = ${shlib.suffix}
   make.command = ${make.command}
 

Modified: harmony/enhanced/classlib/trunk/modules/portlib/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/build.xml?view=diff&rev=544145&r1=544144&r2=544145
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/build.xml (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/build.xml Mon Jun  4 05:50:51 2007
@@ -28,11 +28,13 @@
 
     <property file="../../make/depends.properties" />
     <property name="fdlibm.zip" location="${depends.oss}/fdlibm_5.2.zip" />
+    <available property="hythr.available"
+        file="${hy.jdk}/jre/bin/default/${shlib.prefix}hythr${shlib.suffix}" />
     <condition property="test.portlib">
         <and>
             <isset property="is.32bit" />
             <not><isset property="is.windows" /></not>
-            <equals arg1="${hy.no.thr}" arg2="false" />
+            <isset property="hythr.available" />
         </and>
     </condition>
 
@@ -187,6 +189,10 @@
     <target name="-run-native-tests" if="test.portlib" >
         <mkdir dir="${hy.tests.reports}" />
         <property environment="env"/>
+        <condition property="hy.thr.libpath"
+                   value="${path.separator}${hy.jdk}/jre/bin/default" else="">
+            <equals arg1="${hy.no.thr}" arg2="true" />
+        </condition>
         <exec-native test="init" />
         <exec-native test="hyerror" />
         <exec-native test="hytime" />
@@ -221,11 +227,11 @@
                   outputproperty="@{test}.output"
                   resultproperty="@{test}.resultcode" >
                 <env key="PATH"
-                     path="${env.Path}:${env.PATH}:${hy.jdk}/jre/bin" />
+                     path="${env.Path}${path.separator}${env.PATH}${path.separator}${hy.jdk}/jre/bin${hy.thr.libpath}"
/>
                 <env key="Path"
-                     path="${env.Path}:${env.PATH}:${hy.jdk}/jre/bin" />
+                     path="${env.Path}${path.separator}${env.PATH}${path.separator}${hy.jdk}/jre/bin${hy.thr.libpath}"
/>
                 <env key="LD_LIBRARY_PATH"
-                     path="${env.LD_LIBRARY_PATH}:${hy.jdk}/jre/bin" />
+                     path="${env.LD_LIBRARY_PATH}${path.separator}${hy.jdk}/jre/bin${hy.thr.libpath}"
/>
             </exec>
             <condition property="@{test}.result" value="passed" else="FAILED">
                 <equals arg1="${@{test}.resultcode}" arg2="0" />

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile?view=diff&rev=544145&r1=544144&r2=544145
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyerror/unix/makefile
Mon Jun  4 05:50:51 2007
@@ -21,6 +21,9 @@
 
 BUILDFILES = $(SHAREDSUB)hyerror.o
 MDLLIBFILES += $(DLLPATH)libhyprt$(HY_LINKLIB_SUFFIX)
+ifeq ($(HY_NO_THR),true)
+MDLLIBFILES += $(LIBPATH)libhythr$(HY_LINKLIB_SUFFIX)
+endif
 EXENAME = ../hyerror
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile?view=diff&rev=544145&r1=544144&r2=544145
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hyfile/unix/makefile Mon
Jun  4 05:50:51 2007
@@ -21,6 +21,9 @@
 
 BUILDFILES = $(SHAREDSUB)hyfile.o
 MDLLIBFILES += $(DLLPATH)libhyprt$(HY_LINKLIB_SUFFIX)
+ifeq ($(HY_NO_THR),true)
+MDLLIBFILES += $(LIBPATH)libhythr$(HY_LINKLIB_SUFFIX)
+endif
 EXENAME = ../hyfile
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/shared/hytime.c
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/shared/hytime.c?view=diff&rev=544145&r1=544144&r2=544145
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/shared/hytime.c
(original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/shared/hytime.c
Mon Jun  4 05:50:51 2007
@@ -25,6 +25,9 @@
 {
   HyPortLibrary hyportLibrary;
   HyPortLibraryVersion portLibraryVersion;
+#ifdef HY_NO_THR
+  HyThreadLibrary *privateThreadLibrary;
+#endif
   UDATA msec, usec;
   I_64 millis;
   U_64 hires, hires2, freq, delta;
@@ -40,6 +43,10 @@
   }
 
   printf("  portlib initialized\n");
+
+#ifdef HY_NO_THR
+  privateThreadLibrary = hyportLibrary.port_get_thread_library(&hyportLibrary);
+#endif
 
   msec = hyportLibrary.time_msec_clock(&hyportLibrary);
   printf("msec = %u\n", msec);

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile?view=diff&rev=544145&r1=544144&r2=544145
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/hytime/unix/makefile Mon
Jun  4 05:50:51 2007
@@ -21,6 +21,9 @@
 
 BUILDFILES = $(SHAREDSUB)hytime.o
 MDLLIBFILES += $(DLLPATH)libhyprt$(HY_LINKLIB_SUFFIX)
+ifeq ($(HY_NO_THR),true)
+MDLLIBFILES += $(LIBPATH)libhythr$(HY_LINKLIB_SUFFIX)
+endif
 EXENAME = ../hytime
 
 include $(HY_HDK)/build/make/rules.mk

Modified: harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile
URL: http://svn.apache.org/viewvc/harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile?view=diff&rev=544145&r1=544144&r2=544145
==============================================================================
--- harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile (original)
+++ harmony/enhanced/classlib/trunk/modules/portlib/src/test/native/init/unix/makefile Mon
Jun  4 05:50:51 2007
@@ -21,6 +21,9 @@
 
 BUILDFILES = $(SHAREDSUB)init.o
 MDLLIBFILES += $(DLLPATH)libhyprt$(HY_LINKLIB_SUFFIX)
+ifeq ($(HY_NO_THR),true)
+MDLLIBFILES += $(LIBPATH)libhythr$(HY_LINKLIB_SUFFIX)
+endif
 EXENAME = ../init
 
 include $(HY_HDK)/build/make/rules.mk



Mime
View raw message