Travis: fixed rust, re-activate other impls

Aegwenia · Oct 9, 2015 · 4e8d7c2 · 4e8d7c2
1 parent 1a93c0c
commit 4e8d7c2
Show file tree

Hide file tree

Showing 4 changed files with 85 additions and 89 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -5,89 +5,92 @@ language: node
 services:
   - docker
 
+# matrix layout based on:
+# https://github.com/libressl-portable/portable/blob/9e090286b55def5ca2c0cc375c65023a70d8796e/.travis.yml
+
 matrix:
   include:
-#    - env: IMPL=awk
-#      os: linux
-#    - env: IMPL=bash
-#      os: linux
-#    - env: IMPL=c
-#      os: linux
-#    - env: IMPL=cpp
-#      os: linux
-#    - env: IMPL=coffee
-#      os: linux
-#    - env: IMPL=cs
-#      os: linux
-#    - env: IMPL=clojure
-#      os: linux
-#    - env: IMPL=crystal
-#      os: linux
-#    - env: IMPL=elixir
-#      os: linux
-#    - env: IMPL=erlang
-#      os: linux
-#    - env: IMPL=es6
-#      os: linux
-#    - env: IMPL=factor
-#      os: linux
-#    - env: IMPL=forth
-#      os: linux
-#    - env: IMPL=fsharp
-#      os: linux
-#    - env: IMPL=go
-#      os: linux
-#    - env: IMPL=groovy
-#      os: linux
-#    - env: IMPL=guile
-#      os: linux
-#    - env: IMPL=haskell
-#      os: linux
-#    - env: IMPL=java
-#      os: linux
-#    - env: IMPL=js
-#      os: linux
-#    - env: IMPL=julia
-#      os: linux
-#    - env: IMPL=lua
-#      os: linux
-#    - env: IMPL=make
-#      os: linux
-#    - env: IMPL=mal BUILD_IMPL=js
-#      os: linux
-#    #- env: IMPL=matlab  # licensed (until port to Octave)
-#    #  os: linux
-#    #- env: IMPL=miniMAL  # repl/string slice bug
-#    #  os: linux
-#    - env: IMPL=nim
-#      os: linux
-#    - env: IMPL=ocaml
-#      os: linux
-#    - env: IMPL=perl
-#      os: linux
-#    - env: IMPL=php
-#      os: linux
-#    - env: IMPL=ps
-#      os: linux
-#    - env: IMPL=python
-#      os: linux
-#    - env: IMPL=r
-#      os: linux
-#    - env: IMPL=racket
-#      os: linux
-#    - env: IMPL=rpython
-#      os: linux
-#    - env: IMPL=ruby
-#      os: linux
+    - env: IMPL=awk
+      os: linux
+    - env: IMPL=bash
+      os: linux
+    - env: IMPL=c
+      os: linux
+    - env: IMPL=cpp
+      os: linux
+    - env: IMPL=coffee
+      os: linux
+    - env: IMPL=cs
+      os: linux
+    - env: IMPL=clojure
+      os: linux
+    - env: IMPL=crystal
+      os: linux
+    - env: IMPL=elixir
+      os: linux
+    - env: IMPL=erlang
+      os: linux
+    - env: IMPL=es6
+      os: linux
+    - env: IMPL=factor
+      os: linux
+    - env: IMPL=forth
+      os: linux
+    - env: IMPL=fsharp
+      os: linux
+    - env: IMPL=go
+      os: linux
+    - env: IMPL=groovy
+      os: linux
+    - env: IMPL=guile
+      os: linux
+    - env: IMPL=haskell
+      os: linux
+    - env: IMPL=java
+      os: linux
+    - env: IMPL=js
+      os: linux
+    - env: IMPL=julia
+      os: linux
+    - env: IMPL=lua
+      os: linux
+    - env: IMPL=make
+      os: linux
+    - env: IMPL=mal BUILD_IMPL=js
+      os: linux
+    #- env: IMPL=matlab  # licensed (until port to Octave)
+    #  os: linux
+    #- env: IMPL=miniMAL  # repl/string slice bug
+    #  os: linux
+    - env: IMPL=nim
+      os: linux
+    - env: IMPL=ocaml
+      os: linux
+    - env: IMPL=perl
+      os: linux
+    - env: IMPL=php
+      os: linux
+    - env: IMPL=ps
+      os: linux
+    - env: IMPL=python
+      os: linux
+    - env: IMPL=r
+      os: linux
+    - env: IMPL=racket
+      os: linux
+    - env: IMPL=rpython
+      os: linux
+    - env: IMPL=ruby
+      os: linux
     - env: IMPL=rust
       os: linux
-#    - env: IMPL=scala
-#      os: linux
-#    - env: IMPL=swift
-#      os: osx
-#      osx_image: xcode7
-#    - env: IMPL=vb
-#      os: linux
+    - env: IMPL=scala
+      os: linux
+    - env: IMPL=swift
+      os: osx
+      osx_image: xcode7
+    - env: IMPL=vb
+      os: linux
 
 script:
   - ./.travis_build.sh

diff --git a/.travis_test.sh b/.travis_test.sh
@@ -14,5 +14,3 @@ osx)
     #make TEST_OPTS="--soft --log-file ../perf" perf^${IMPL}
     ;;
 esac
-cat test.out
-#cat perf.out
diff --git a/README.md b/README.md
@@ -452,7 +452,7 @@ You must have [rpython](https://rpython.readthedocs.org/) on your path
 
 ```
 cd rpython
-make        # this takes a long time
+make        # this takes a very long time
 ./stepX_YYY
 ```
 

diff --git a/rust/Dockerfile b/rust/Dockerfile
@@ -29,12 +29,7 @@ RUN apt-get -y install pkg-config
 # rust install script requirements
 RUN apt-get -y install git sudo
 
-#RUN rm -f /dev/tty && mknod -m 666 /dev/tty c 5 0
+ENV MULTIRUST_HOME /opt/multirust
 RUN curl -sf https://raw.githubusercontent.com/brson/multirust/master/blastoff.sh > /tmp/blastoff.sh && chmod +x /tmp/blastoff.sh && /tmp/blastoff.sh --yes && rm /tmp/blastoff.sh
 
-RUN multirust default stable
-
-RUN chmod ugo+rx /root /root/.*
-RUN chmod -R ugo+rw /root
-ENV HOME /root
-#ENV MULTIRUST_HOME /mal
+ENV CARGO_HOME /tmp/.cargo