harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From smish...@apache.org
Subject svn commit: r645367 - in /harmony/enhanced/buildtest/trunk: infra/adaptors/tptp/adaptor.xml infra/adaptors/tptp/parameters.xml tests/tptp/build.xml
Date Mon, 07 Apr 2008 04:23:50 GMT
Author: smishura
Date: Sun Apr  6 21:23:49 2008
New Revision: 645367

URL: http://svn.apache.org/viewvc?rev=645367&view=rev
Log:
Apply patch from HARMONY-5650:
[testing][tptp] TPTP test suite uses outdated and unstable version of agent controller

Modified:
    harmony/enhanced/buildtest/trunk/infra/adaptors/tptp/adaptor.xml
    harmony/enhanced/buildtest/trunk/infra/adaptors/tptp/parameters.xml
    harmony/enhanced/buildtest/trunk/tests/tptp/build.xml

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/tptp/adaptor.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/tptp/adaptor.xml?rev=645367&r1=645366&r2=645367&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/tptp/adaptor.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/tptp/adaptor.xml Sun Apr  6 21:23:49 2008
@@ -27,6 +27,18 @@
     <property name="tptp.report"     value="${tptp.results}/tptp_report"/>      
     <property name="tptp.failed.zip" value="${tptp.results}/FailedTests.zip"/>    
 
 
+    <!-- Setup the TPTP profiler test suite -->
+    <target name="setup" description="Setup TPTP profiler tests."> 
+        <log message="============= Adaptor for ${suite.name}. Setup .."/>
+        <!-- call ant script of the tptp project -->
+        <ant antfile="build.xml"
+                dir="${work.dir}"
+                target="setup"
+                inheritAll="false">
+            <property name="test.home" value="${work.dir}/${tests.module}"/>
+        </ant>
+    </target>
+
     <!-- Run the TPTP profiler test suite -->
     <target name="run" description="Run TPTP profiler tests."> 
         <log message="============= Adaptor for ${suite.name}. Run .."/>
@@ -55,7 +67,6 @@
                   failproperty="tptp.tests.failed">
             <sysproperty key="test.home"         value="${work.dir}/${tests.module}"/>
             <sysproperty key="tested.runtime"    value="${tested.runtime}"/>
-            <sysproperty key="ac.home"           value="${agent.controller.home}"/>
             <sysproperty key="tptp.test.class"   value="${tptp.parameters.optional.tptp.test.class}"/>
             <sysproperty key="runner.arguments"  value="${tptp.parameters.optional.runner.arguments}"/>
             <sysproperty key="tptp.options"      value="${tptp.parameters.optional.runner.vm.options}"/>

Modified: harmony/enhanced/buildtest/trunk/infra/adaptors/tptp/parameters.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/infra/adaptors/tptp/parameters.xml?rev=645367&r1=645366&r2=645367&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/infra/adaptors/tptp/parameters.xml (original)
+++ harmony/enhanced/buildtest/trunk/infra/adaptors/tptp/parameters.xml Sun Apr  6 21:23:49
2008
@@ -21,9 +21,6 @@
         <tested.runtime
             description="Path to Tested Runtime"
             value="${drlvm.parameters.shared.jre.dir}"/>
-        <agent.controller.home
-            description="Agent controller runtime location"
-            value=""/>
         <tptp.tests.build.home
             description="Location of the TPTP tests build"
             value=""/>
@@ -37,9 +34,12 @@
         <tested.vm.options
             description="JVM options for tested runtime"
             value=""/>
+<!-- Specify -Dtime.precision=1000000 (1000000 nanos == 1 millis) to avoid test
+failures due to nonmonotonic behavior of gettimeofday() function on some linux
+systems -->
         <runner.vm.options
-            description="Options for tests runner VM (for example, -Doutput.delete=true)"
-            value=""/>
+            description="Options for tests runner VM (for example, -Ddelete.output=false)"
+            value="-Dtime.precision=1000000"/>
         <runner.arguments
             description="These arguments will be passed to test runner"
             value=""/>

Modified: harmony/enhanced/buildtest/trunk/tests/tptp/build.xml
URL: http://svn.apache.org/viewvc/harmony/enhanced/buildtest/trunk/tests/tptp/build.xml?rev=645367&r1=645366&r2=645367&view=diff
==============================================================================
--- harmony/enhanced/buildtest/trunk/tests/tptp/build.xml (original)
+++ harmony/enhanced/buildtest/trunk/tests/tptp/build.xml Sun Apr  6 21:23:49 2008
@@ -52,6 +52,38 @@
 
 -->
 
+    <condition property="tptp.os" value="win">
+        <os family="windows"/>
+    </condition>
+
+    <condition property="tptp.os" value="linux">
+        <os name="linux"/>
+    </condition>
+
+    <condition property="tptp.arch" value="em64t">
+        <or>
+            <equals arg1="x86_64" arg2="${os.arch}"/>
+            <equals arg1="amd64" arg2="${os.arch}"/>
+        </or>
+    </condition>
+
+    <condition property="tptp.arch" value="ia32">
+        <or>
+            <equals arg1="x86" arg2="${os.arch}"/>
+            <equals arg1="i386" arg2="${os.arch}"/>
+            <equals arg1="i686" arg2="${os.arch}"/>
+        </or>
+    </condition>
+
+    <condition property="tptp.arch" value="ipf">
+        <equals arg1="ia64" arg2="${os.arch}"/>
+    </condition>
+
+    <property name="work.dir" location="${basedir}"/>
+    <property name="ac.location" value="http://mirrors.cat.pdx.edu/eclipse/tptp/4.5.0/TPTP-4.5.0M5-200802170400/"/>
+    <property name="ac.filename" value="agntctrl.${tptp.os}_${tptp.arch}-TPTP-4.5.0M5.zip"/>
+    <property name="ac.home" location="${work.dir}/tptpdc"/>
+
     <!-- path to the reference runtime -->
     <property name="jvm.reference" location="${java.home}/bin/java"/>
     
@@ -71,6 +103,23 @@
     <!-- All arguments -->
     <property name="jvm.args" value="${tptp.options} -Dtest.param='${tested.vm.options}'
-Dtest.timeout=${test.timeout} -Dconfigfile=${config.file.new} -Dtest.output=${report.dir}
-Dtest.java=${tested.runtime} -Dtest.home=${test.home} -Dac.home=${ac.home} -Dtest.verbose=false
-Xbootclasspath/p:${bootclasspath_jar} "/> 
       
+    <!-- ================ Setup ================ -->
+    <target name="setup"
+            depends="fetch-ac"
+            description="Download and install dependencies">
+    </target>
+
+    <target name="fetch-ac"
+            description="Download and install TPTP Agent Controller">
+        <delete dir="${ac.home}" failonerror="false"/>
+        <mkdir dir="${ac.home}"/>
+        <get src="${ac.location}/${ac.filename}"
+             dest="${work.dir}/${ac.filename}"
+             usetimestamp="true"
+             verbose="true" />
+        <unzip src="${work.dir}/${ac.filename}" dest="${ac.home}"/>
+    </target>
+
     <!-- Tests running -->     
     <target name="run" depends="compile"> 
         <!-- Clear previous results -->



Mime
View raw message