[tor-commits] [snowflake/master] Run client tests in travis too

arlo at torproject.org arlo at torproject.org
Tue Mar 15 03:42:07 UTC 2016


commit 9867730e34ae1105ee98274de7ce2e37ecbc7b14
Author: Arlo Breault <arlolra at gmail.com>
Date:   Mon Mar 14 18:16:51 2016 -0700

    Run client tests in travis too
---
 .travis.yml        | 40 +++++++++++++++++++++++++++-------------
 proxy/package.json | 22 ++++++++++++++++++++++
 2 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index ec7038a..0f72040 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,22 +1,36 @@
 language: go
 
+sudo: required
+dist: trusty
+
+addons:
+    apt:
+        sources:
+            - ubuntu-toolchain-r-test
+        packages:
+            - g++-5
+            - gcc-5
+
 go:
-  - 1.5
-  - 1.6
+    - 1.6
 
 env:
-  - TRAVIS_NODE_VERSION="4.1"
+    - TRAVIS_NODE_VERSION="4.2" CC="gcc-5" CXX="g++-5"
 
-install:
-  - rm -rf ~/.nvm && git clone https://github.com/creationix/nvm.git ~/.nvm && (cd ~/.nvm && git checkout `git describe --abbrev=0 --tags`) && source ~/.nvm/nvm.sh && nvm install $TRAVIS_NODE_VERSION
-  - go get -u github.com/smartystreets/goconvey
+before_install:
+    - nvm install $TRAVIS_NODE_VERSION
 
-before_script:
-  npm install -g coffee-script coffeelint jasmine
+install:
+    - go get -u github.com/smartystreets/goconvey
+    - go get -u github.com/keroserene/go-webrtc
+    - go get -u git.torproject.org/pluggable-transports/goptlib.git
+    - pushd proxy
+    - npm install
+    - popd
 
 script:
-  - make check
-  - go test -v -race ./broker
-  - cd proxy
-  - cake lint
-  - cake test
+    - make check
+    - go test -v -race ./broker ./client
+    - cd proxy
+    - npm run-script lint
+    - npm test
diff --git a/proxy/package.json b/proxy/package.json
new file mode 100644
index 0000000..0a23eb4
--- /dev/null
+++ b/proxy/package.json
@@ -0,0 +1,22 @@
+{
+  "name": "snowflake-pt",
+  "version": "0.0.0-git",
+  "description": "WebRTC Pluggable Transport",
+  "main": "snowflake.coffee",
+  "directories": {
+    "test": "test"
+  },
+  "scripts": {
+    "test": "cake test",
+    "lint": "cake lint"
+  },
+  "author": "Serene Han",
+  "license": "BSD-3-Clause",
+  "devDependencies": {
+    "coffeelint": "^1.15.0",
+    "jasmine": "^2.4.1"
+  },
+  "dependencies": {
+    "coffee-script": "^1.10.0"
+  }
+}



More information about the tor-commits mailing list