diff options
| author | Artur Signell <artur.signell@itmill.com> | 2012-01-10 15:29:57 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2012-01-10 15:29:57 +0000 |
| commit | fb7b7f4b6222c5a97e670f38e387ce90a4c784f9 (patch) | |
| tree | 4a243fa960b414c88a7109ff8af772e28b35dd37 /build | |
| parent | f7a3041dcdaa0c9e34fccbca8bcfeae411e128a8 (diff) | |
| download | vaadin-framework-fb7b7f4b6222c5a97e670f38e387ce90a4c784f9.tar.gz vaadin-framework-fb7b7f4b6222c5a97e670f38e387ce90a4c784f9.zip | |
#8105 Ensure tests are built by the "server-side-tests" target and included in the junit classpath
svn changeset:22580/svn branch:6.7
Diffstat (limited to 'build')
| -rw-r--r-- | build/build.xml | 6 |
1 files 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" /> |