mfirry 10 years ago
parent
commit
e5ae866dc2
1 changed files with 11 additions and 10 deletions
  1. 11 10
      .travis.yml

+ 11 - 10
.travis.yml

@@ -1,5 +1,5 @@
 language: python
 language: python
-python: 
+python:
   - "2.7"
   - "2.7"
 
 
 env:
 env:
@@ -9,12 +9,12 @@ env:
     # we end up starting ~200+ different workers. Seems that ~100 is the limit
     # we end up starting ~200+ different workers. Seems that ~100 is the limit
     # before their website starts to lag heavily
     # before their website starts to lag heavily
     #
     #
-    # Here's the bash if you need to update this. Be sure to maintain the 
+    # Here's the bash if you need to update this. Be sure to maintain the
     # lines that are currently commented out (these cannot run in Travis)
     # lines that are currently commented out (these cannot run in Travis)
-    #   cd frameworks 
+    #   cd frameworks
     #   find . -type d -depth 2 | sed 's|./|    - "TESTDIR=|' | sed 's/$/"/g'
     #   find . -type d -depth 2 | sed 's|./|    - "TESTDIR=|' | sed 's/$/"/g'
     #
     #
-    #  
+    #
     - "TESTDIR=C/lwan"
     - "TESTDIR=C/lwan"
     - "TESTDIR=C/duda"
     - "TESTDIR=C/duda"
     - "TESTDIR=C/haywire"
     - "TESTDIR=C/haywire"
@@ -142,6 +142,7 @@ env:
     - "TESTDIR=Ruby/rails"
     - "TESTDIR=Ruby/rails"
     - "TESTDIR=Ruby/rails-stripped"
     - "TESTDIR=Ruby/rails-stripped"
     - "TESTDIR=Ruby/sinatra"
     - "TESTDIR=Ruby/sinatra"
+    - "TESTDIR=Scala/colossus"
     - "TESTDIR=Scala/finagle"
     - "TESTDIR=Scala/finagle"
     - "TESTDIR=Scala/lift-stateless"
     - "TESTDIR=Scala/lift-stateless"
     - "TESTDIR=Scala/plain"
     - "TESTDIR=Scala/plain"
@@ -155,7 +156,7 @@ env:
     - "TESTDIR=Ur/urweb"
     - "TESTDIR=Ur/urweb"
 
 
 before_install:
 before_install:
-  # Need to install python modules before using 
+  # Need to install python modules before using
   # python
   # python
   - pip install -r requirements.txt
   - pip install -r requirements.txt
 
 
@@ -164,15 +165,15 @@ before_install:
   - ./toolset/run-ci.py cisetup "$TESTDIR"
   - ./toolset/run-ci.py cisetup "$TESTDIR"
 
 
 addons:
 addons:
-  postgresql: "9.3" 
+  postgresql: "9.3"
 
 
 install:
 install:
   # Install prerequisites
   # Install prerequisites
   - ./toolset/run-ci.py prereq "$TESTDIR"
   - ./toolset/run-ci.py prereq "$TESTDIR"
-  
-  # Install software for this framework  
+
+  # Install software for this framework
   - ./toolset/run-ci.py install "$TESTDIR"
   - ./toolset/run-ci.py install "$TESTDIR"
-   
-script: 
+
+script:
   # Pick one test in this directory and verify
   # Pick one test in this directory and verify
   - time ./toolset/run-ci.py verify "$TESTDIR"
   - time ./toolset/run-ci.py verify "$TESTDIR"