Skip to content

Commit

Permalink
Merge pull request #1652 from alwin-joseph/oldtck-run-singletest
Browse files Browse the repository at this point in the history
  • Loading branch information
@arjantijms
arjantijms committed Apr 22, 2022
2 parents 99756c2 + 4c6d823 commit 0c5b42e
Show file tree
Hide file tree
Showing 4 changed files with 71 additions and 16 deletions.
29 changes: 22 additions & 7 deletions tck/faces-tck/pom-bundle.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<tck.tests.home>${tck.home}/src/com/sun/ts/tests/jsf</tck.tests.home>
<tck.mode>standalone</tck.mode>
<glassfish.home>${project.build.directory}/glassfish7</glassfish.home>
<glassfish.version>7.0.0-M2</glassfish.version>
<glassfish.version>7.0.0-M4</glassfish.version>
<glassfish.asadmin>${glassfish.home}/glassfish/bin/asadmin</glassfish.asadmin>

<jacoco.includes>org/glassfish/**\:com/sun/enterprise/**</jacoco.includes>
Expand Down Expand Up @@ -373,7 +373,7 @@
<goal>run</goal>
</goals>
<configuration>
<target>
<target xmlns:if="ant:if" xmlns:unless="ant:unless">
<replace file="${glassfish.home}/glassfish/domains/domain1/config/domain.xml"
token="-Xmx512m" value="-Xmx1024m" />

Expand All @@ -385,10 +385,24 @@
</exec>
</limit>

<exec executable="${ant.home}/bin/ant" dir="${tck.tests.home}">
<arg value="-Dutil.dir=${tck.home}" />
<arg value="deploy.all" />
</exec>
<!-- Deploy single test -->
<sequential if:set="run.test" >
<dirname property="test.dir" file="${tck.home}/src/${run.test}"/>
<echo>Deploying from ${test.dir}</echo>

<exec executable="${ant.home}/bin/ant" dir="${test.dir}">
<arg value="deploy" />
</exec>
</sequential>

<!-- Deploy all tests -->
<sequential unless:set="run.test" >
<echo>Deploying all archives</echo>
<exec executable="${ant.home}/bin/ant" dir="${tck.tests.home}">
<arg value="-Dutil.dir=${tck.home}" />
<arg value="deploy.all" />
</exec>
</sequential>
</target>
</configuration>
</execution>
Expand All @@ -410,7 +424,8 @@
<exec executable="${ant.home}/bin/ant" dir="${tck.tests.home}" resultproperty="testResult">
<arg value="-Dutil.dir=${tck.home}" />
<arg value="-Dmultiple.tests=${run.test}" if:set="run.test" />
<arg value="runclient"/>
<arg value="run.all" unless:set="run.test"/>
<arg value="runclient" if:set="run.test" />
<env key="LC_ALL" value="C" />
</exec>

Expand Down
30 changes: 22 additions & 8 deletions tck/faces-tck/pom.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
<tck.tests.home>${tck.home}/src/com/sun/ts/tests/jsf</tck.tests.home>
<tck.mode>standalone</tck.mode>
<glassfish.home>${project.build.directory}/glassfish7</glassfish.home>
<glassfish.version>7.0.0-M2</glassfish.version>
<glassfish.version>7.0.0-M4</glassfish.version>
<glassfish.asadmin>${glassfish.home}/glassfish/bin/asadmin</glassfish.asadmin>

<jacoco.includes>org/glassfish/**\:com/sun/enterprise/**</jacoco.includes>
Expand Down Expand Up @@ -410,7 +410,7 @@
<goal>run</goal>
</goals>
<configuration>
<target>
<target xmlns:if="ant:if" xmlns:unless="ant:unless">
<replace file="${glassfish.home}/glassfish/domains/domain1/config/domain.xml"
token="-Xmx512m" value="-Xmx1024m" />

Expand All @@ -421,11 +421,25 @@
<arg value="start-domain"/>
</exec>
</limit>

<!-- Deploy single test -->
<sequential if:set="run.test" >
<dirname property="test.dir" file="${tck.home}/src/${run.test}"/>
<echo>Deploying from ${test.dir}</echo>

<exec executable="${ant.home}/bin/ant" dir="${test.dir}">
<arg value="deploy" />
</exec>
</sequential>

<exec executable="${ant.home}/bin/ant" dir="${tck.tests.home}">
<arg value="-Dutil.dir=${tck.home}" />
<arg value="deploy.all" />
</exec>
<!-- Deploy all tests -->
<sequential unless:set="run.test" >
<echo>Deploying all archives</echo>
<exec executable="${ant.home}/bin/ant" dir="${tck.tests.home}">
<arg value="-Dutil.dir=${tck.home}" />
<arg value="deploy.all" />
</exec>
</sequential>
</target>
</configuration>
</execution>
Expand All @@ -447,10 +461,10 @@
<exec executable="${ant.home}/bin/ant" dir="${tck.tests.home}" resultproperty="testResult">
<arg value="-Dutil.dir=${tck.home}" />
<arg value="-Dmultiple.tests=${run.test}" if:set="run.test" />
<arg value="runclient"/>
<arg value="run.all" unless:set="run.test"/>
<arg value="runclient" if:set="run.test" />
<env key="LC_ALL" value="C" />
</exec>

<if>
<not>
<equals arg1="${testResult}" arg2="0" />
Expand Down
25 changes: 25 additions & 0 deletions tck/faces-tck/src/com/sun/ts/tests/jsf/common/beans.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2022 Oracle and/or its affiliates. All rights reserved.
This program and the accompanying materials are made available under the
terms of the Eclipse Public License v. 2.0, which is available at
http://www.eclipse.org/legal/epl-2.0.
This Source Code may also be made available under the following Secondary
Licenses when the conditions for such availability set forth in the
Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
version 2 with the GNU Classpath Exception, which is available at
https://www.gnu.org/software/classpath/license.html.
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->


<beans xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
bean-discovery-mode="all">
</beans>
3 changes: 2 additions & 1 deletion tck/faces-tck/src/com/sun/ts/tests/jsf/spec/flows/common/beans.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -20,5 +20,6 @@
<beans xmlns="https://jakarta.ee/xml/ns/jakartaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="
https://jakarta.ee/xml/ns/jakartaee
https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd">
https://jakarta.ee/xml/ns/jakartaee/beans_4_0.xsd"
bean-discovery-mode="all">
</beans>

0 comments on commit 0c5b42e

Please sign in to comment.