Merge branch 'master' into datablock-wr-order

Author: js-labs

ant_tasks/GetTestNameTask.java

@@ -0,0 +1,25 @@
+import java.util.Map;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.Task;
+
+public class GetTestNameTask extends Task {
+    private String m_propertyName;
+
+    public void setPropertyName(String propertyName) {
+        m_propertyName = propertyName;
+    }
+
+    public void execute() throws BuildException {
+        final String owningTargetName = getOwningTarget().getName();
+        final String prefix = "test.";
+        if (!owningTargetName.startsWith(prefix)) {
+            throw new BuildException("target name must has prefix '" + prefix + "'");
+        }
+        if (m_propertyName == null) {
+            throw new BuildException("missing 'propertyName' attribite value");
+        }
+        final Project project = getProject();
+        project.setProperty(m_propertyName, owningTargetName.substring(prefix.length()));
+    }
+}

build.xml

@@ -35,11 +35,7 @@
     <macrodef name="run-test">
         <sequential>
             <property name="testName" value=""/>
-            <script language="javascript"> <![CDATA[
-                targetName = self.getOwningTarget().toString();
-                project.setProperty( "testName", targetName.slice(5) );
-            ]]>
-            </script>
+            <get-test-name propertyName="testName"/>
             <java classname="org.jsl.tests.${testName}.Main" fork="true">
                 <classpath>
                     <pathelement location="${build}/classes"/>
@@ -53,6 +49,7 @@
     </macrodef>
 
     <target name="init">
+        <mkdir dir="${build}/ant_tasks"/>
         <mkdir dir="${build}/classes"/>
         <mkdir dir="${dist}/lib"/>
     </target>
@@ -96,9 +93,14 @@
         <copy file="pom.xml" tofile="${dist}/lib/${ant.project.name}-${version}.pom"/>
     </target>
 
-    <target name="compile_tests" depends="compile">
+    <target name="compile_ant_tasks" depends="init">
+        <javac srcdir="ant_tasks" destdir="${build}/ant_tasks" includeAntRuntime="true" debug="true"/>
+        <taskdef name="get-test-name" classname="GetTestNameTask" classpath="${build}/ant_tasks"/>
+    </target>
+
+    <target name="compile_tests" depends="compile, compile_ant_tasks">
         <mkdir dir="${build}/tests"/>
-        <javac srcdir="tests/src" destdir="${build}/tests" includeantruntime="false" debug="true">
+        <javac srcdir="tests/src" destdir="${build}/tests" includeAntRuntime="false" debug="true">
             <classpath>
                 <pathelement location="${build}/classes"/>
             </classpath>
@@ -213,5 +215,4 @@
                      test.thread_pool_throughput,
                      test.timer_queue,
                      test.unit"/>
-
 </project>