[Title] Fixed test build error

[Desc.]
[Issue]

Change-Id: Ie16132b8eacb414c25c4ec28e582e7afe9f3dd9e

diff --git a/package/build-common.xml b/package/build-common.xml
index 63fe521..fcd7861 100644 (file)
--- a/package/build-common.xml
+++ b/package/build-common.xml
@@ -20,18 +20,6 @@
         </sequential>\r
     </macrodef>\r
 \r
-    <macrodef name="bx-conversion">\r
-        <attribute name="src" default="${dir.build}" />\r
-        <attribute name="target" default="${dir.test.report}/coverage.em" />\r
-        <sequential>\r
-            <emma enabled="true">\r
-                <instr instrpath="@{src}" metadatafile="@{target}" mode="overwrite" merge="true" >\r
-                     <filter excludes="*Test, *Test$*, *.Mock*" />\r
-                </instr>\r
-            </emma>\r
-        </sequential>\r
-    </macrodef>\r
-    \r
     <macrodef name="bx-rake-test">\r
         <attribute name="src" default="${dir.test.src}" />\r
         <attribute name="build" default="${dir.build}" />\r
@@ -70,6 +58,7 @@
                 includeantruntime="false"\r
             >\r
                 <classpath>\r
+                    <dirset dir="${dir.common.lib}" includes="org.tizen.common*" />\r
                     <fileset dir="${dir.lib}" includes="*.jar" excludes="org.eclipse.equinox.http.jetty*.jar" />\r
                     <fileset dir="${dir.test.lib}" includes="*.jar" />\r
                     <fileset dir="${dir.common.lib}" includes="*.jar" />\r
@@ -135,8 +124,6 @@
         <sequential>\r
             <sleep seconds="3" />\r
             <junit haltonfailure="no" showoutput="yes" printsummary="yes" fork="true" >\r
-                <jvmarg value="-Demma.coverage.out.file=@{dest}/coverage.ec" />\r
-                <jvmarg value="-Demma.coverage.out.merge=true" />\r
                 <classpath>\r
                     <fileset dir="${dir.lib}" includes="*.jar" excludes="org.eclipse.equinox.http.jetty*.jar" />\r
                     <fileset dir="${dir.test.lib}" includes="*.jar" />\r
@@ -160,13 +147,6 @@
                 </fileset>\r
                 <report format="frames" todir="@{dest}" />\r
             </junitreport>\r
-\r
-            <emma enabled="true">\r
-                <report >\r
-                    <infileset dir="${dir.test.report}" includes="*.em, *.ec" />\r
-                    <xml outfile="${dir.test.report}/coverage.xml" depth="method"  />\r
-                </report>\r
-            </emma>\r
         </sequential>\r
     </macrodef>\r
     \r
@@ -207,19 +187,12 @@
     </target>\r
     \r
     <target name="test" description="Test module">\r
-        <path id="emma.lib">\r
-            <pathelement location="${jenkins.test.lib}/emma.jar" />\r
-            <pathelement location="${jenkins.test.lib}/emma_ant.jar" />\r
-        </path>\r
-        <taskdef resource="emma_ant.properties" classpathref="emma.lib" />\r
-\r
         <bx-ver />\r
                <bx-rake-test />\r
                <bx-javac-test />\r
                <bx-prepare dir="${dir.dist}/lib" />\r
                <bx-jar dest="${file.dist.test}" />\r
                <!--\r
-               <bx-conversion />\r
                <bx-junit />\r
         <bx-clean />\r
                -->\r

diff --git a/package/build.xml b/package/build.xml
index c534a05..9ef486b 100644 (file)
--- a/package/build.xml
+++ b/package/build.xml
@@ -4,11 +4,11 @@
        <property file="build.properties" />
        
        <import file="build-common.xml" />
-    <taskdef resource="net/sf/antcontrib/antcontrib.properties">
+    <!--taskdef resource="net/sf/antcontrib/antcontrib.properties">
         <classpath>
             <pathelement location="/usr/lib/jvm/jdk1.6.0_32/lib/ant-contrib-1.0b3.jar" />
         </classpath>
-    </taskdef>
+    </taskdef-->
 
     <target name="help" >
        <echo message="사용방법 : ant [task]" />