From 68c1fb02671319f4bc1132baa6d793adb3fbba60 Mon Sep 17 00:00:00 2001
From: Taeyoung Son <taeyoung2.son@samsung.com>
Date: Fri, 13 Sep 2013 15:27:34 +0900
Subject: [PATCH] [Title] Fixed test build error [Desc.] [Issue]

Change-Id: Ie16132b8eacb414c25c4ec28e582e7afe9f3dd9e
---
 package/build-common.xml | 29 +----------------------------
 package/build.xml        |  4 ++--
 2 files changed, 3 insertions(+), 30 deletions(-)

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