Permalink
Browse files

Updated CI work

  • Loading branch information...
1 parent 9be0cdd commit d91f5d570dd8d6ed976852b483b704129190b92a @coldfumonkeh committed Mar 27, 2015
View
@@ -18,4 +18,4 @@ WEB-INF
.vagrant
# Testing
-mxunit
+/mxunit
View
@@ -4,15 +4,15 @@ env:
# currently the only way to do a multi-dimensional env matrix
- PLATFORM=railo40 TESTFRAMEWORK=mxunit
- PLATFORM=railo41 TESTFRAMEWORK=mxunit
- - PLATFORM=railo42beta TESTFRAMEWORK=mxunit
-# - PLATFORM=acf10-linux64 TESTFRAMEWORK=mxunit
+ - PLATFORM=railo42 TESTFRAMEWORK=mxunit
+ - PLATFORM=lucee451 TESTFRAMEWORK=mxunit
+ - PLATFORM=acf10-linux64 TESTFRAMEWORK=mxunit
- PLATFORM=acf902-linux64 TESTFRAMEWORK=mxunit
-# - PLATFORM=railo40 TESTFRAMEWORK=testbox
-# - PLATFORM=railo41 TESTFRAMEWORK=testbox
-# - PLATFORM=railo42beta TESTFRAMEWORK=testbox
-# - PLATFORM=acf10-linux64 TESTFRAMEWORK=testbox
-# - PLATFORM=lucee42 TESTFRAMEWORK=mxunit
-
+ - PLATFORM=railo40 TESTFRAMEWORK=testbox
+ - PLATFORM=railo41 TESTFRAMEWORK=testbox
+ - PLATFORM=railo42 TESTFRAMEWORK=testbox
+ - PLATFORM=lucee451 TESTFRAMEWORK=testbox
+ - PLATFORM=acf10-linux64 TESTFRAMEWORK=testbox
install: ant -Dtest.framework=$TESTFRAMEWORK -Dsource=remote -Dwork.dir=$HOME/work -Dbuild.dir=$TRAVIS_BUILD_DIR -Dplatform=$PLATFORM install-ci-deps
script: ant -Dtest.framework=$TESTFRAMEWORK -Dsource=remote -Dwork.dir=$HOME/work -Dbuild.dir=$TRAVIS_BUILD_DIR -Dplatform=$PLATFORM test-ci
View
@@ -34,7 +34,14 @@ Share the love and visit Matt's wishlist: http://www.amazon.co.uk/wishlist/B9PFN
monkehTweets requires ColdFusion 8+
-The package has also been tested on Railo 3.3.1.000
+The package has been tested on:
+
+* Adobe ColdFusion 9
+* Adobe ColdFusion 10
+* Railo 4
+* Railo 4.1
+* Railo 4.2
+* Lucee 4.5
Project home: http://monkehTweet.riaforge.org
View
@@ -2,7 +2,7 @@
<project basedir="." default="test" name="monkehTweet">
<!--
- The monkehTweets project.
+ The CFML CI template project.
For integration instructions, see the Github project page:
@@ -31,11 +31,12 @@
<!-- Local URLs: Set these to locally available copies of the test server
platforms if available to avoid a remote HTTP download - won't work for Travis CI -->
<property name="railo41.local.url" value="/opt/ci/railo-express-4.1.2.005-nojre.tar.gz" />
+ <property name="railo42.local.url" value="/opt/ci/railo-express-4.2.1.000-nojre.tar.gz" />
<property name="railo41-osx.local.url" value="/opt/ci/railo-express-4.1.2.005-macosx.zip" />
+ <property name="lucee451.local.url" value="/opt/ci/lucee-express-4.5.1.000.zip" />
<property name="acf10-linux32.local.url" value="/opt/ci/cf10-linux32.tar.gz" />
<property name="acf10-linux64.local.url" value="/opt/ci/cf10-linux64.tar.gz" />
<property name="acf902-linux64.local.url" value="/opt/ci/cf902-linux64.tar.gz" />
- <property name="lucee42.local.url" value="/opt/ci/lucee-4.5.0.042-express.zip" />
<!-- test frameworks -->
<property name="testbox.local.url" value="/opt/ci/testbox_1.1.0.zip" />
@@ -44,14 +45,13 @@
<!-- Remote URLs -->
<property name="railo40.remote.url" value="http://cfml-ci.s3.amazonaws.com/railo-express-4.0.4.001-nojre.tar.gz" />
<property name="railo41.remote.url" value="http://cfml-ci.s3.amazonaws.com/railo-express-4.1.2.005-nojre.tar.gz" />
- <property name="railo42beta.remote.url" value="http://cfml-ci.s3.amazonaws.com/railo-express-4.2.0.000-nojre.tar.gz" />
+ <property name="railo42.remote.url" value="http://cfml-ci.s3.amazonaws.com/railo-express-4.2.1.000-nojre.tar.gz" />
+ <property name="lucee451.remote.url" value="https://bitbucket.org/lucee/lucee/downloads/lucee-4.5.1.000-express.zip" />
<property name="acf10-linux32.remote.url" value="http://cfml-ci.s3.amazonaws.com/cf10-linux32.tar.gz" />
<property name="acf10-linux64.remote.url" value="http://cfml-ci.s3.amazonaws.com/cf10-linux64.tar.gz" />
<property name="acf902-linux64.remote.url" value="http://cfml-ci.s3.amazonaws.com/cf902-linux64.tar.gz" />
- <property name="lucee42.remote.url" value="https://bitbucket.org/lucee/lucee/downloads/lucee-4.5.0.042-express.zip" />
-
- <property name="testbox.remote.url" value="http://downloads.ortussolutions.com/testbox_1.1.0.zip" />
+ <property name="testbox.remote.url" value="http://downloads.ortussolutions.com/ortussolutions/testbox/1.1.0/testbox-1.1.0.zip" />
<property name="mxunit.remote.url" value="https://github.com/marcins/mxunit/archive/fix-railo-nulls.zip" />
<!--
@@ -65,21 +65,20 @@
<property name="railo40.helper" value="railo" />
<property name="railo41.helper" value="railo" />
<property name="railo41-osx.helper" value="railo" />
- <property name="railo42beta.helper" value="railo" />
+ <property name="railo42.helper" value="railo-42plus" />
+ <property name="lucee451.helper" value="lucee" />
<property name="acf10-linux32.helper" value="acf" />
<property name="acf10-linux64.helper" value="acf" />
<property name="acf902-linux64.helper" value="acf9" />
- <property name="lucee42.helper" value="lucee42" />
<fail unless="platform" message="Platform is not set" />
<fail unless="${platform}.${source}.url">Unkown platform ${platform} for source ${source}.
Valid values are:
- lucee42
railo40
railo41
railo41-osx
- railo42beta
+ railo42
acf10-linux32
acf10-linux64
acf902-linux64</fail>
View
0 tests/Application.cfc 100755 → 100644
No changes.
View
0 tests/ci/HttpAntRunner.cfc 100755 → 100644
No changes.
View
0 tests/ci/mxunit-ant.jar 100755 → 100644
No changes.
View
No changes.
@@ -0,0 +1,29 @@
+#!/bin/bash
+case $1 in
+ start)
+ CONTROL_SCRIPT='./startup.sh'
+ ;;
+ stop)
+ CONTROL_SCRIPT='./shutdown.sh'
+ ;;
+esac
+
+PLATFORM_DIR="lucee"
+WEBROOT="webapps/ROOT"
+MY_DIR=`dirname $0`
+source $MY_DIR/ci-helper-base.sh $1 $2
+
+case $1 in
+ install)
+ chmod a+x ./startup.sh
+ chmod a+x ./shutdown.sh
+ ;;
+ start|stop)
+ ;;
+ *)
+ echo "Usage: $0 {install|start|stop}"
+ exit 1
+ ;;
+esac
+
+exit 0
@@ -1,33 +0,0 @@
-#!/bin/bash
-case $1 in
- start)
- CONTROL_SCRIPT='lucee-4.5.0.042-express/start.sh'
- ;;
- stop)
- CONTROL_SCRIPT='lucee-4.5.0.042-express/stop.sh'
- ;;
-esac
-
-PLATFORM_DIR="lucee-4.5.0.042-express"
-WEBROOT="lucee-4.5.0.042-express/webapps/ROOT"
-MY_DIR=`dirname $0`
-source $MY_DIR/ci-helper-base.sh $1 $2
-
-case $1 in
- install)
- chmod a+x lucee-4.5.0.042-express/start.sh
- chmod a+x lucee-4.5.0.042-express/stop.sh
-
- sed -i "s/jetty.port=8888/jetty.port=$SERVER_PORT/g" lucee-4.5.0.042-express/start.sh
- sed -i "s/STOP.PORT=8887/STOP.PORT=$STOP_PORT/g" lucee-4.5.0.042-express/start.sh
- sed -i "s/STOP.PORT=8887/STOP.PORT=$STOP_PORT/g" lucee-4.5.0.042-express/stop.sh
- ;;
- start|stop)
- ;;
- *)
- echo "Usage: $0 {install|start|stop}"
- exit 1
- ;;
-esac
-
-exit 0
View
0 tests/ci/testbox-runner.cfm 100755 → 100644
No changes.
View
No changes.
View
0 tests/testbox/dummyTest.cfc 100755 → 100644
No changes.

0 comments on commit d91f5d5

Please sign in to comment.