make node tests pass on macos

pull/5120/head
Jan Tattermusch 9 years ago
parent d2ae3c0259
commit e477b84c92
  1. 2
      tools/jenkins/docker_run_tests.sh
  2. 4
      tools/run_tests/build_node.sh
  3. 4
      tools/run_tests/pre_build_node.sh
  4. 4
      tools/run_tests/run_node.sh
  5. 10
      tools/run_tests/run_tests.py

@ -43,8 +43,6 @@ chown `whoami` $XDG_CACHE_HOME
mkdir -p /var/local/git
git clone --recursive /var/local/jenkins/grpc /var/local/git/grpc
nvm use 0.12 || true
if [ -x "$(command -v rvm)" ]
then
rvm use ruby-2.1

@ -29,8 +29,12 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
NODE_VERSION=$1
source ~/.nvm/nvm.sh
set -ex
nvm use $NODE_VERSION
CONFIG=${CONFIG:-opt}
# change to grpc repo root

@ -29,8 +29,12 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
NODE_VERSION=$1
source ~/.nvm/nvm.sh
set -ex
nvm use $NODE_VERSION
export GRPC_CONFIG=${CONFIG:-opt}
# Expire cache after 1 week

@ -28,8 +28,12 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
NODE_VERSION=$1
source ~/.nvm/nvm.sh
set -ex
nvm use $NODE_VERSION
CONFIG=${CONFIG:-opt}
# change to grpc repo root

@ -194,13 +194,17 @@ class CLanguage(object):
class NodeLanguage(object):
def __init__(self):
self.node_version = '0.12'
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)]
def pre_build_steps(self):
# 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):
return []
@ -209,7 +213,7 @@ class NodeLanguage(object):
return []
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):
return []

Loading…
Cancel
Save