Skip to content
Snippets Groups Projects
Commit e477b84c authored by Jan Tattermusch's avatar Jan Tattermusch
Browse files

make node tests pass on macos

parent d2ae3c02
No related branches found
No related tags found
No related merge requests found
...@@ -43,8 +43,6 @@ chown `whoami` $XDG_CACHE_HOME ...@@ -43,8 +43,6 @@ chown `whoami` $XDG_CACHE_HOME
mkdir -p /var/local/git mkdir -p /var/local/git
git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc
nvm use 0.12 || true
if [ -x "$(command -v rvm)" ] if [ -x "$(command -v rvm)" ]
then then
rvm use ruby-2.1 rvm use ruby-2.1
......
...@@ -29,8 +29,12 @@ ...@@ -29,8 +29,12 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
NODE_VERSION=$1
source ~/.nvm/nvm.sh
set -ex set -ex
nvm use $NODE_VERSION
CONFIG=${CONFIG:-opt} CONFIG=${CONFIG:-opt}
# change to grpc repo root # change to grpc repo root
......
...@@ -29,8 +29,12 @@ ...@@ -29,8 +29,12 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
NODE_VERSION=$1
source ~/.nvm/nvm.sh
set -ex set -ex
nvm use $NODE_VERSION
export GRPC_CONFIG=${CONFIG:-opt} export GRPC_CONFIG=${CONFIG:-opt}
# Expire cache after 1 week # Expire cache after 1 week
......
...@@ -28,8 +28,12 @@ ...@@ -28,8 +28,12 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
NODE_VERSION=$1
source ~/.nvm/nvm.sh
set -ex set -ex
nvm use $NODE_VERSION
CONFIG=${CONFIG:-opt} CONFIG=${CONFIG:-opt}
# change to grpc repo root # change to grpc repo root
......
...@@ -194,13 +194,17 @@ class CLanguage(object): ...@@ -194,13 +194,17 @@ class CLanguage(object):
class NodeLanguage(object): class NodeLanguage(object):
def __init__(self):
self.node_version = '0.12'
def test_specs(self, config, args): def test_specs(self, config, args):
return [config.job_spec(['tools/run_tests/run_node.sh'], None, return [config.job_spec(['tools/run_tests/run_node.sh', self.node_version],
None,
environ=_FORCE_ENVIRON_FOR_WRAPPERS)] environ=_FORCE_ENVIRON_FOR_WRAPPERS)]
def pre_build_steps(self): def pre_build_steps(self):
# Default to 1 week cache expiration # Default to 1 week cache expiration
return [['tools/run_tests/pre_build_node.sh']] return [['tools/run_tests/pre_build_node.sh', self.node_version]]
def make_targets(self, test_regex): def make_targets(self, test_regex):
return [] return []
...@@ -209,7 +213,7 @@ class NodeLanguage(object): ...@@ -209,7 +213,7 @@ class NodeLanguage(object):
return [] return []
def build_steps(self): def build_steps(self):
return [['tools/run_tests/build_node.sh']] return [['tools/run_tests/build_node.sh', self.node_version]]
def post_tests_steps(self): def post_tests_steps(self):
return [] return []
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment