Rewrite based on eshost

Author: bterlson

index.js

@@ -0,0 +1,39 @@
+'use strict';
+const Rx = require('rx');
+const eshost = require('eshost');
+
+module.exports = makePool;
+function makePool(agents, hostType, hostArgs, hostPath) {
+  const pool = new Rx.Subject();
+
+  for (var i = 0; i < agents; i++) {
+    eshost.createAgent(hostType, {
+      hostArguments: hostArgs,
+      hostPath: hostPath
+    })
+    .then(agent => {
+      pool.onNext(agent);
+    })
+    .catch(e => {
+      console.error('Error creating agent: ');
+      console.error(e);
+      process.exit(1);
+    });
+  }
+
+  pool.runTest = function (record) {
+    const agent = record[0];
+    const test = record[1];
+    return agent.evalScript(test.contents)
+    .then(result => {
+      pool.onNext(agent);
+      test.rawResult = result;
+      return test;
+    })
+    .catch(err => {
+      console.error('Error running test: ', err);
+      process.exit(1);
+    });
+  }
+  return pool;
+}

lib/agentPool.js

@@ -0,0 +1,15 @@
+const yargs = require('yargs');
+const yargv = yargs
+  .usage('Usage: test262-harness [options] <test-file-glob>')
+  .demand('hostType')
+  .describe('hostType', 'eshost host type (chakra, d8, jsshell, chrome, firefox, etc.)')
+  .describe('hostPath', 'path to eshost host binary')
+  .describe('hostArgs', 'command-line arguments to pass to eshost host')
+  .describe('test262Dir', 'test262 root directory')
+  .describe('includesDir', 'directory where helper files are found')
+  .describe('threads', 'number of threads to use')
+  .default('threads', 1)
+  .help('help')
+  .example('test262-harness path/to/test.js')
+
+exports.argv = yargv.argv;

lib/cli.js

@@ -0,0 +1,46 @@
+'use strict';
+
+const fs = require('fs');
+const Path = require('path');
+
+module.exports = findTest262Dir;
+function findTest262Dir(globber) {
+  const set = globber.minimatch.set;
+  let baseDir;
+  for (let i = 0; i < set.length; i++) {
+    let base = [];
+
+    for (let j = 0; j < set[i].length; j++) {
+      if (typeof set[i][j] !== 'string') {
+        break;
+      }
+
+      base.push(set[i][j]);
+    }
+
+    baseDir = findTest262Root(base.join("/"));
+
+    if (baseDir) {
+      break;
+    }
+  }
+
+  return baseDir;
+}
+
+function findTest262Root(path) {
+  const contents = fs.readdirSync(path)
+  if (contents.indexOf('README.md') > -1
+      && contents.indexOf('test') > -1
+      && contents.indexOf('harness') > -1) {
+    return path;
+  }
+
+  const parent = Path.resolve(path, '../');
+
+  if (parent === path) {
+    return null;
+  }
+
+  return findTest262Root(parent);
+}

lib/findTest262.js

@@ -0,0 +1,22 @@
+'use strict';
+const glob = require('glob');
+const Rx = require('rx');
+
+function globber(g) {
+  const Glob = glob.Glob;
+  const fileEvents = new Glob(g);
+  const paths = new Rx.Subject();
+
+  fileEvents.on('match', function (file) {
+    paths.onNext(file);
+  });
+
+  fileEvents.on('end', function () {
+    paths.onCompleted();
+  })
+
+  paths.fileEvents = fileEvents;
+  return paths;
+}
+
+module.exports = globber;