Permalink
Browse files

Updating test process on Travis

  • Loading branch information...
1 parent 355b092 commit df57077e24edae5a70a954d13479d06c9a7039aa @coldfumonkeh committed Nov 12, 2016
Showing with 39 additions and 19 deletions.
  1. +18 −18 .travis.yml
  2. +20 −0 .travis.yml.bak
  3. +1 −1 build.xml
View
@@ -1,20 +1,20 @@
language: java
-env:
- matrix:
-# currently the only way to do a multi-dimensional env matrix
- #- PLATFORM=railo40 TESTFRAMEWORK=mxunit
- #- PLATFORM=railo41 TESTFRAMEWORK=mxunit
- #- PLATFORM=railo42 TESTFRAMEWORK=mxunit
- - PLATFORM=lucee451 TESTFRAMEWORK=mxunit
- # - PLATFORM=lucee5_beta TESTFRAMEWORK=mxunit
- # - PLATFORM=acf10-linux64 TESTFRAMEWORK=mxunit
- - PLATFORM=acf902-linux64 TESTFRAMEWORK=mxunit
- # - PLATFORM=railo40 TESTFRAMEWORK=testbox
- # - PLATFORM=railo41 TESTFRAMEWORK=testbox
- # - PLATFORM=railo42 TESTFRAMEWORK=testbox
- # - PLATFORM=lucee5_beta TESTFRAMEWORK=testbox
- # - PLATFORM=lucee451 TESTFRAMEWORK=testbox
- # - PLATFORM=acf10-linux64 TESTFRAMEWORK=testbox
+sudo: required
+dist: trusty
-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
+before_install:
+ - sudo apt-key adv --keyserver keys.gnupg.net --recv 6DA70622
+ - sudo echo "deb http://downloads.ortussolutions.com/debs/noarch /" | sudo tee -a /etc/apt/sources.list.d/commandbox.list
+
+install:
+ #Commandbox setup
+  - box install
+  - box server start port=49616 rewritesEnable=false openBrowser=false
+
+before_script:
+ - curl http://localhost:49616/
+
+script: >
+    testResults="echo $(box testbox run)";
+    echo "$testResults";
+    if grep -i "\[Failures: [1-9][0-9]\?\]\|<t[^>]*>\|<b[^>]*>" <<< $testResults;  then exit 1; fi
View
@@ -0,0 +1,20 @@
+language: java
+env:
+ matrix:
+# currently the only way to do a multi-dimensional env matrix
+ - PLATFORM=railo40 TESTFRAMEWORK=mxunit
+ - PLATFORM=railo41 TESTFRAMEWORK=mxunit
+ - PLATFORM=railo42 TESTFRAMEWORK=mxunit
+ - PLATFORM=lucee451 TESTFRAMEWORK=mxunit
+ - PLATFORM=lucee5_beta TESTFRAMEWORK=mxunit
+ # - PLATFORM=acf10-linux64 TESTFRAMEWORK=mxunit
+ - PLATFORM=acf902-linux64 TESTFRAMEWORK=mxunit
+ # - PLATFORM=railo40 TESTFRAMEWORK=testbox
+ # - PLATFORM=railo41 TESTFRAMEWORK=testbox
+ # - PLATFORM=railo42 TESTFRAMEWORK=testbox
+ # - PLATFORM=lucee5_beta 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
@@ -53,7 +53,7 @@
<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="testbox.remote.url" value="http://downloads.ortussolutions.com/ortussolutions/testbox/2.0.0/testbox-2.0.0.zip" />
+ <property name="testbox.remote.url" value="https://github.com/Ortus-Solutions/TestBox/archive/master.zip" />
<property name="mxunit.remote.url" value="https://github.com/marcins/mxunit/archive/fix-railo-nulls.zip" />
<!--

0 comments on commit df57077

Please sign in to comment.