Skip to content

Commit

Permalink
Fixed tabs and added module to parent
Browse files Browse the repository at this point in the history
Signed-off-by: Arjan Tijms <arjan.tijms@gmail.com>
  • Loading branch information
arjantijms committed Apr 20, 2022
1 parent 8d1eeb1 commit c744762
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 22 deletions.
44 changes: 22 additions & 22 deletions appserver/tests/tck/expression_language/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ mvn clean install -Drun.test="com/sun/ts/tests/el/api/jakarta_el/methodexpressio
<artifactId>glassfish-external-tck-expression-language</artifactId>
<packaging>jar</packaging>

<name>TCK: expression-language</name>
<name>TCK: Expression Language</name>

<properties>
<ant.home>${project.build.directory}/apache-ant-${ant.version}</ant.home>
Expand Down Expand Up @@ -158,8 +158,8 @@ mvn clean install -Drun.test="com/sun/ts/tests/el/api/jakarta_el/methodexpressio
<goal>unpack-dependencies</goal>
</goals>
<configuration>
<overWriteSnapshots>true</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
<overWriteSnapshots>true</overWriteSnapshots>
<overWriteIfNewer>true</overWriteIfNewer>
<includeArtifactIds>glassfish</includeArtifactIds>
<outputDirectory>${project.build.directory}</outputDirectory>
</configuration>
Expand Down Expand Up @@ -258,25 +258,25 @@ mvn clean install -Drun.test="com/sun/ts/tests/el/api/jakarta_el/methodexpressio
<target xmlns:if="ant:if" xmlns:unless="ant:unless">
<taskdef resource="net/sf/antcontrib/antcontrib.properties" classpathref="maven.plugin.classpath" />

<sequential unless:set="tck.standalone">
<echo level="info" message="Start running all tests" />
<exec executable="${ant.home}/bin/ant" dir="${tck.home}/bin" resultproperty="testResult">
<arg value="-Dmultiple.tests=${run.test}" if:set="run.test" />
<arg value="run.all" unless:set="run.test"/>
<arg value="runclient" if:set="run.test" />
<arg value="-Dkeywords=all" />
<env key="LC_ALL" value="C" />
</exec>
<if>
<not>
<equals arg1="${testResult}" arg2="0" />
</not>
<then>
<echo message="Running tests failed." />
</then>
</if>
</sequential>
<sequential unless:set="tck.standalone">
<echo level="info" message="Start running all tests" />
<exec executable="${ant.home}/bin/ant" dir="${tck.home}/bin" resultproperty="testResult">
<arg value="-Dmultiple.tests=${run.test}" if:set="run.test" />
<arg value="run.all" unless:set="run.test"/>
<arg value="runclient" if:set="run.test" />
<arg value="-Dkeywords=all" />
<env key="LC_ALL" value="C" />
</exec>
<if>
<not>
<equals arg1="${testResult}" arg2="0" />
</not>
<then>
<echo message="Running tests failed." />
</then>
</if>
</sequential>
</target>
</configuration>
</execution>
Expand Down
1 change: 1 addition & 0 deletions appserver/tests/tck/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,7 @@
<modules>
<module>embedded_ejb_smoke</module>
<module>tck-download</module>
<module>expression_language</module>
<module>rest</module>
<module>faces</module>
<module>authentication</module>
Expand Down

0 comments on commit c744762

Please sign in to comment.