diff options
| author | Jonatan Kronqvist <jonatan@vaadin.com> | 2014-12-15 15:07:15 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2014-12-17 11:28:06 +0000 |
| commit | 272711e6f7eed94d933380599cb434a5cfe38f00 (patch) | |
| tree | f377c7c748809285bafd4bdf76855e68321bce48 /client-compiler/build.xml | |
| parent | 9b8022feaacf6ef11b509697ad8ccdd01b0262f5 (diff) | |
| download | vaadin-framework-272711e6f7eed94d933380599cb434a5cfe38f00.tar.gz vaadin-framework-272711e6f7eed94d933380599cb434a5cfe38f00.zip | |
Fix the license checker after elemental.json #15383
The elemental.json update changed how null values and string
representations of numbers were parsed, which caused a lot of
tests for CvalChecker to fail. Unfortunately the tests were
never run in an automated fashion, which means that they were
never discovered until we stumbled upon it due to the issue
reported in #15383
Change-Id: If2cb9fa96effea7ce55a4ffe6d1666ca7521e1fb
Diffstat (limited to 'client-compiler/build.xml')
| -rw-r--r-- | client-compiler/build.xml | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/client-compiler/build.xml b/client-compiler/build.xml index 97189fc437..be8dec18bc 100644 --- a/client-compiler/build.xml +++ b/client-compiler/build.xml @@ -16,7 +16,16 @@ <path id="classpath.compile.custom"> <fileset file="${gwt.dev.jar}" /> </path> - + <path id="classpath.test.custom"> + <fileset dir="${result.dir}/classes"> + <include name="**/*" /> + </fileset> + </path> + <property name="extra.classes" value="**/*.properties" /> + <!-- don't try to copy the same files twice (first from classes and then + from sources) in order for the build not to fail when packaging the + JAR --> + <property name="jar.exclude" value="**/*.properties" /> <union id="compiler.includes"> <union refid="client-compiler.gwt.includes" /> <fileset dir="${result.dir}"> @@ -62,8 +71,8 @@ </target> <target name="test" depends="checkstyle"> - <!--<antcall target="common.test.run" /> --> - <echo>WHAT? No tests for ${module.name}!</echo> + <antcall target="common.test.run" /> + <!--<echo>WHAT? No tests for ${module.name}!</echo>--> </target> </project> |