Permalink
Browse files

Test Fixes

  • Loading branch information...
michaelhashimoto authored and brianchandotcom committed Feb 4, 2012
1 parent add6423 commit 262f703fe419078c37e8d5c335d9ca7da459902e
Showing with 18 additions and 30 deletions.
  1. +15 −24 build-test-db-upgrade.xml
  2. +3 −6 build-test.xml
View
@@ -14,45 +14,36 @@
<property name="sql.dir" value="sql\legacy\${sql.version}\create\" />
<if>
- <equals arg1="${db.type}" arg2="db2" />
+ <contains string="${db.type}" substring="db2" />
<then>
<property name="sql.file" value="create-db2.sql" />
</then>
<elseif>
- <equals arg1="${db.type}" arg2="mysql" />
+ <contains string="${db.type}" substring="mysql" />
<then>
<property name="sql.file" value="create-mysql.sql" />
</then>
</elseif>
<elseif>
- <or>
- <equals arg1="${db.type}" arg2="oracle-10" />
- <equals arg1="${db.type}" arg2="oracle-11" />
- </or>
+ <contains string="${db.type}" substring="oracle" />
<then>
<property name="sql.file" value="create-oracle.sql" />
</then>
</elseif>
<elseif>
- <or>
- <equals arg1="${db.type}" arg2="postgresql-8.4" />
- <equals arg1="${db.type}" arg2="postgresql-9.0" />
- </or>
+ <contains string="${db.type}" substring="postgresql" />
<then>
<property name="sql.file" value="create-postgresql.sql" />
</then>
</elseif>
<elseif>
- <or>
- <equals arg1="${db.type}" arg2="sql-server-2005" />
- <equals arg1="${db.type}" arg2="sql-server-2008" />
- </or>
+ <contains string="${db.type}" substring="sql-server" />
<then>
<property name="sql.file" value="create-sql-server.sql" />
</then>
</elseif>
<elseif>
- <equals arg1="${db.type}" arg2="sybase" />
+ <contains string="${db.type}" substring="sybase" />
<then>
<property name="sql.file" value="create-sybase.sql" />
</then>
@@ -70,55 +61,55 @@
<target name="prepare-db-db2-common">
<echo file="test.${user.name}.properties">db.type=db2</echo>
- <antcall target="prepare-db-common" />
+ <antcall target="prepare-db-common" inheritAll="false" />
</target>
<target name="prepare-db-mysql-common">
<echo file="test.${user.name}.properties">db.type=mysql</echo>
- <antcall target="prepare-db-common" />
+ <antcall target="prepare-db-common" inheritAll="false" />
</target>
<target name="prepare-db-oracle-10-common">
<echo file="test.${user.name}.properties">db.type=oracle-10</echo>
- <antcall target="prepare-db-common" />
+ <antcall target="prepare-db-common" inheritAll="false" />
</target>
<target name="prepare-db-oracle-11-common">
<echo file="test.${user.name}.properties">db.type=oracle-11</echo>
- <antcall target="prepare-db-common" />
+ <antcall target="prepare-db-common" inheritAll="false" />
</target>
<target name="prepare-db-postgresql-8.4-common">
<echo file="test.${user.name}.properties">db.type=postgresql-8.4</echo>
- <antcall target="prepare-db-common" />
+ <antcall target="prepare-db-common" inheritAll="false" />
</target>
<target name="prepare-db-postgresql-9.0-common">
<echo file="test.${user.name}.properties">db.type=postgresql-9.0</echo>
- <antcall target="prepare-db-common" />
+ <antcall target="prepare-db-common" inheritAll="false" />
</target>
<target name="prepare-db-sql-server-2005-common">
<echo file="test.${user.name}.properties">db.type=sql-server-2005</echo>
- <antcall target="prepare-db-common" />
+ <antcall target="prepare-db-common" inheritAll="false" />
</target>
<target name="prepare-db-sql-server-2008-common">
<echo file="test.${user.name}.properties">db.type=sql-server-2008</echo>
- <antcall target="prepare-db-common" />
+ <antcall target="prepare-db-common" inheritAll="false" />
</target>
<target name="prepare-db-sybase-common">
<echo file="test.${user.name}.properties">db.type=sybase</echo>
- <antcall target="prepare-db-common" />
+ <antcall target="prepare-db-common" inheritAll="false" />
</target>
<target name="run-latest-upgrade-test">
View
@@ -2188,7 +2188,7 @@ tunnel.servlet.hosts.allowed=
resource.repositories.root=$${user.home}/liferay</echo>
<if>
- <equals arg1="${db.type}" arg2="db2" />
+ <contains string="${db.type}" substring="db2" />
<then>
<echo file="portal-impl/src/portal-ext.properties" append="true">
@@ -2197,10 +2197,7 @@ custom.sql.function.isnull=CAST(? AS VARCHAR(32672)) IS NULL
custom.sql.function.isnotnull=CAST(? AS VARCHAR(32672)) IS NOT NULL</echo>
</then>
<elseif>
- <or>
- <equals arg1="${db.type}" arg2="oracle-10" />
- <equals arg1="${db.type}" arg2="oracle-11" />
- </or>
+ <contains string="${db.type}" substring="oracle" />
<then>
<echo file="portal-impl/src/portal-ext.properties" append="true">
@@ -2211,7 +2208,7 @@ jdbc.default.numHelperThreads=1</echo>
</then>
</elseif>
<elseif>
- <equals arg1="${db.type}" arg2="sybase" />
+ <contains string="${db.type}" substring="sybase" />
<then>
<echo file="portal-impl/src/portal-ext.properties" append="true">

0 comments on commit 262f703

Please sign in to comment.