From fb7b7f4b6222c5a97e670f38e387ce90a4c784f9 Mon Sep 17 00:00:00 2001
From: Artur Signell <artur.signell@itmill.com>
Date: Tue, 10 Jan 2012 15:29:57 +0000
Subject: [PATCH] #8105 Ensure tests are built by the "server-side-tests"
 target and included in the junit classpath

svn changeset:22580/svn branch:6.7
---
 build/build.xml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/build.xml b/build/build.xml
index 039501d4fb..a856db618b 100644
--- a/build/build.xml
+++ b/build/build.xml
@@ -43,8 +43,6 @@
              uri="antlib:org.apache.maven.artifact.ant"
              classpathref="maven-ant-tasks.classpath" />
 
-	<!-- Folder where Emma instrumented classes are placed (if Emma is used)-->
-	<property name="result-classes-emma-core" value="${result-path}/classes/emma-core"/>
 	
     <!-- Clean results - - - - - - - - - - - - - - - - - - - - - - - - - -->
     <target name="clean-result" depends="build.properties">
@@ -66,6 +64,8 @@
 		<property name="result-classes-core" value="${result-path}/classes/core"/>
 		<property name="result-classes-junit" value="${result-path}/classes/junit"/>
 		<property name="result-classes-testbench" value="${result-path}/classes/testbench"/>
+		<!-- Folder where Emma instrumented classes are placed (if Emma is used)-->
+		<property name="result-classes-emma-core" value="${result-path}/classes/emma-core"/>
 
 	</target>
     <target name="clean-all" depends="clean-result">
@@ -978,7 +978,7 @@
 		</emma>    	    	
         <junit printsummary="yes"> 
             <classpath> 
-                <pathelement path="${result-classes-core-for-emma-junit}" />
+                <pathelement path="${result-path}/junit_emma_classes" />
                 <pathelement path="${result-classes-core}" />
                 <pathelement path="${result-classes-junit}" />
             	<path refid="emma.lib" />
-- 
2.39.5