Re-enable io2014 + add cds2014 tests for devenv.

ports/devenv/tests/common.js

 /*
  * Copyright (c) 2014 The Native Client Authors. All rights reserved.
  * Use of this source code is governed by a BSD-style license that can be
  * found in the LICENSE file.
  */
 
 /* globals ASSERT_EQ, EXPECT_EQ, EXPECT_TRUE, chrometest */
 
 'use strict';
 
@@ skipping 22 matching lines @@
   }).then(function() {
     return chrometest.proxyExtension('TCP Interface');
   }).then(function(ext) {
     self.tcp = ext;
     return self.initFileSystem();
   }).then(function() {
     return self.mkdir('/home');
   }).then(function() {
     return self.mkdir('/home/user');
   }).then(function() {
-    return self.checkCommand('bash -c exit 0', 0);
+    return self.checkCommand('bash -c exit', 0);
   }).then(function() {
     if (self.params['latest'] === '1')
       return self.setLocalRepo(window.location.origin);
   });
 };
 
 DevEnvTest.prototype.tearDown = function() {
   var self = this;
   return Promise.resolve().then(function() {
     self.devEnv.disconnect();
@@ skipping 26 matching lines @@
         output += msg.output;
         chrometest.info('stdout: ' + msg.output);
       });
   }).then(function(msg) {
     ASSERT_EQ(name, msg.name, 'expected message');
     msg.output = output;
     return msg;
   });
 };
 
-DevEnvTest.prototype.spawnCommand = function(cmd) {
+DevEnvTest.prototype.spawnCommand = function(cmd, env) {
   var self = this;
 
-  var env = ['HOME=/home/user', 'NACL_DATA_MOUNT_FLAGS=manifest=/manifest.txt'];
+  if (env === undefined) {
+    env = [];
+  }
+  env.push('HOME=/home/user');
+  env.push('NACL_DATA_MOUNT_FLAGS=manifest=/manifest.txt');
   if (this.params['latest'] === '1') {
     env.push('NACL_DEVENV_LOCAL=1');
   }
 
   return Promise.resolve().then(function() {
     self.devEnv.postMessage({
       'name': 'nacl_spawn',
       'nmf': 'bash.nmf',
       'argv': ['bash', '--login', '-c', cmd],
       'cwd': '/home/user',
@@ skipping 15 matching lines @@
       'options': 0,
     });
     return self.gatherStdoutUntil('nacl_waitpid_reply');
   }).then(function(msg) {
     ASSERT_EQ('nacl_waitpid_reply', msg.name);
     ASSERT_EQ(pid, msg.pid);
     return {status: msg.status, output: msg.output};
   });
 };
 
-DevEnvTest.prototype.runCommand = function(cmd) {
+DevEnvTest.prototype.runCommand = function(cmd, env) {
   var self = this;
   var earlyOutput;
   chrometest.info('runCommand: ' + cmd);
   return Promise.resolve().then(function() {
-    return self.spawnCommand(cmd);
+    return self.spawnCommand(cmd, env);
   }).then(function(msg) {
     earlyOutput = msg.output;
     return self.waitCommand(msg.pid);
   }).then(function(msg) {
     msg.output = earlyOutput + msg.output;
     return msg;
   });
 };
 
 DevEnvTest.prototype.checkCommand = function(
-    cmd, expectedStatus, expectedOutput) {
+    cmd, expectedStatus, expectedOutput, env) {
   if (expectedStatus === undefined) {
     expectedStatus = 0;
   }
   var self = this;
   return Promise.resolve().then(function() {
-    return self.runCommand(cmd);
+    return self.runCommand(cmd, env);
   }).then(function(result) {
     ASSERT_EQ(expectedStatus, result.status, result.output);
     if (expectedOutput !== undefined) {
       ASSERT_EQ(expectedOutput, result.output);
     }
   });
 };
 
 DevEnvTest.prototype.sigint = function(pid) {
   this.devEnv.postMessage({
     'name': 'nacl_sigint',
   });
 };
 
 DevEnvTest.prototype.installPackage = function(name) {
   var cmd = 'pkg install -f -y ' + name;
   chrometest.info(cmd);
   return this.checkCommand(cmd, 0);
 };
 
 DevEnvTest.prototype.installDefaultPackages = function(name) {
-  var cmd = 'bash /mnt/http/install-base-packages.sh';
-  chrometest.info(cmd);
-  return this.checkCommand(cmd, 0);
+  var env = ['INSTALL_BASE_PACKAGES=1'];
+  chrometest.info('install base packages');
+  return this.checkCommand('exit', 0, undefined, env);
 };
 
-
 DevEnvTest.prototype.checkCommandReLines = function(
     cmd, expectedStatus, expectedOutput) {
   var self = this;
   return Promise.resolve().then(function() {
     return self.runCommand(cmd);
   }).then(function(result) {
     ASSERT_EQ(expectedStatus, result.status, result.output);
     var resultLines = result.output.split('\n');
     // Trim the last line if empty to reduce boilerplate.
     if (resultLines[resultLines.length - 1] === '') {
@@ skipping 214 matching lines @@
  * Close a TCP connection.
  * @param {number} socket The TCP socket.
  * @returns {Promise}
  */
 DevEnvTest.prototype.tcpClose = function(socket) {
   return this.tcpExec_({
     name: 'tcp_close',
     socket: socket
   });
 };