Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Test Fixes - TCK Fix

  • Loading branch information...
commit 8d191e8aa344788a9fb45c7bc090218c4cf75065 1 parent 2b2fa21
@michaelhashimoto michaelhashimoto authored brianchandotcom committed
Showing with 13 additions and 5 deletions.
  1. +5 −4 build-test-tck.xml
  2. +8 −1 build-test.xml
View
9 build-test-tck.xml
@@ -31,17 +31,18 @@ tck.url=true</echo>
work.dir=${basedir.unix}/tools/tck/work</echo>
- <delete dir="${liferay.home}/data" />
- <delete dir="${liferay.home}/deploy" />
+ <delete dir="${user.home}/liferay" />
- <copy todir="${liferay.home}/deploy" flatten="true">
+ <copy todir="${user.home}/liferay/deploy" flatten="true">
<fileset
dir="tools/tck"
includes="**/*.war"
/>
</copy>
- <antcall target="rebuild-database" inheritAll="false" />
+ <antcall target="rebuild-database" inheritAll="false">
+ <param name="skip.delete-liferay-home" value="true" />
+ </antcall>
</target>
<target name="run-tck-286-tomcat">
View
9 build-test.xml
@@ -2278,7 +2278,14 @@ file.
<isset property="skip.rebuild-database" />
</not>
<then>
- <delete dir="${user.home}/liferay" />
+ <if>
+ <not>
+ <isset property="skip.delete-liferay-home" />
+ </not>
+ <then>
+ <delete dir="${user.home}/liferay"/>
+ </then>
+ </if>
<if>
<equals arg1="${db.type}" arg2="db2" />
Please sign in to comment.
Something went wrong with that request. Please try again.