Skip to content

Commit

Permalink
LRQA-33560 fix TCK properties
Browse files Browse the repository at this point in the history
  • Loading branch information
stiemannkj1 authored and brianchandotcom committed Apr 5, 2019
1 parent 50b4424 commit cdbe78e
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 7 deletions.
12 changes: 6 additions & 6 deletions build-test-tck.xml
Original file line number Diff line number Diff line change
Expand Up @@ -132,7 +132,7 @@
<actions>
<replaceregexp
file="${tck.tests.xml}"
flags="im"
flags="gis"
match="&lt;entry[^&gt;]+key=&quot;@{key}&quot;[^&gt;]*&gt;[^&lt;]*&lt;/entry&gt;"
replace=""
/>
Expand Down Expand Up @@ -170,21 +170,21 @@

<propertycopy
from="browser.${browser.type[tck]}.version"
name="browser.version" silent="true"
name="tck.browser.version" silent="true"
/>

<propertycopy
from="browser.${browser.type[tck]}.bin.file[${browser.version}]"
name="browser.bin.file" silent="true"
from="browser.${browser.type[tck]}.bin.file[${tck.browser.version}]"
name="tck.browser.bin.file" silent="true"
/>

<propertycopy
from="selenium.${browser.type[tck]}.driver.executable"
name="selenium.tck.browser.driver.executable" silent="true"
name="tck.selenium.browser.driver.executable" silent="true"
/>

<execute dir="${tck.home}" failonerror="false">
mvn -Pliferay,run-tck -Djava.awt.headless=true ${tck.properties} -Dtest.browser=${browser.type[tck]} -Dtest.browser.binary='${browser.bin.file}' -Dtest.browser.webDriver=${project.dir}/tck/${selenium.executable.dir.name}${selenium.tck.browser.driver.executable} -Dtest.list.file=${tck.tests.xml} test
mvn -Pliferay,run-tck -Djava.awt.headless=true ${tck.properties} -Dtest.browser=${browser.type[tck]} -Dtest.browser.binary='${tck.browser.bin.file}' -Dtest.browser.webDriver=${project.dir}/tck/${selenium.executable.dir.name}${tck.selenium.browser.driver.executable} -Dtest.list.file=${tck.tests.xml} test
</execute>

<if>
Expand Down
2 changes: 1 addition & 1 deletion test.properties
Original file line number Diff line number Diff line change
Expand Up @@ -1877,7 +1877,7 @@
test.server.username.id[tck]=_com_liferay_login_web_portlet_LoginPortlet_login
test.server.username[tck]=test@liferay.com
test.session.timeout[tck]=-1
test.timeout[tck]=60
test.timeout[tck]=5

#
# Upgrade
Expand Down

0 comments on commit cdbe78e

Please sign in to comment.