Skip to content
Browse files

made running mysql in tests opt-in

  • Loading branch information...
1 parent 1a309af commit c055f248bc5a0088ddfcd3f74e0fca2e399ea42a @rodnaph committed Jun 12, 2011
Showing with 18 additions and 13 deletions.
  1. +14 −10 build.xml
  2. +4 −3 sockso.properties-sample
View
24 build.xml
@@ -355,16 +355,20 @@ public class Sockso {
<!-- init before we do tests -->
<target name="init-tests">
- <!-- create mysql test database -->
- <sql driver="com.mysql.jdbc.Driver"
- url="jdbc:mysql://${mysql.host}"
- userid="${mysql.user}"
- password="${mysql.pass}"
- classpath="${opt.classpath}"
- onerror="continue">
- <transaction src="test/data/mysql/drop.sql"/>
- <transaction src="test/data/mysql/create.sql"/>
- </sql>
+ <if>
+ <equals arg1="${mysql.enabled}" arg2="1" />
+ <then>
+ <sql driver="com.mysql.jdbc.Driver"
+ url="jdbc:mysql://${mysql.host}"
+ userid="${mysql.user}"
+ password="${mysql.pass}"
+ classpath="${opt.classpath}"
+ onerror="continue">
+ <transaction src="test/data/mysql/drop.sql"/>
+ <transaction src="test/data/mysql/create.sql"/>
+ </sql>
+ </then>
+ </if>
</target>
<!-- tests a particular class -->
View
7 sockso.properties-sample
@@ -20,9 +20,10 @@ googleCode.password
jstestdriver.port=9876
jstestdriver.version=1.2.2
-mysql.host=localhost
-mysql.user=root
-mysql.pass=
+;mysql.enabled=1
+;mysql.host=localhost
+;mysql.user=root
+;mysql.pass=
# optional path to website codebase
website.path=

0 comments on commit c055f24

Please sign in to comment.
Something went wrong with that request. Please try again.