From a74855d50a9fe2262c19f91ea50595de07f610b7 Mon Sep 17 00:00:00 2001 From: David Glasser Date: Thu, 6 Feb 2014 12:32:07 -0800 Subject: [PATCH] bundler-assets: find meteor --- tools/tests/old.js | 6 ++++-- tools/tests/old/test-bundler-assets.js | 2 +- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/tests/old.js b/tools/tests/old.js index 5b9c7e6aae..70bdfa298c 100644 --- a/tools/tests/old.js +++ b/tools/tests/old.js @@ -19,10 +19,12 @@ var maybeFixRelease = function (env) { // // filename is interpreted relative to tools/selftests/old. var runOldTest = function (filename) { - var env; + var s = new Sandbox; var run = new Run(process.execPath, { args: [path.resolve(__dirname, 'old', filename)], - env: maybeFixRelease({}) + env: maybeFixRelease({ + METEOR_TOOL_PATH: s.execPath + }) }); run.waitSecs(1000); run.expectExit(0); diff --git a/tools/tests/old/test-bundler-assets.js b/tools/tests/old/test-bundler-assets.js index 09922b0fdb..2d501bedc0 100644 --- a/tools/tests/old/test-bundler-assets.js +++ b/tools/tests/old/test-bundler-assets.js @@ -104,7 +104,7 @@ var runTest = function () { // Run the app to check that Assets.getText/Binary do the right things. var cp = require('child_process'); - var meteor = path.join(__dirname, "..", "..", "..", "meteor"); // XXX is this allowed? + var meteor = process.env.METEOR_TOOL_PATH; var fut = new Future(); // use a non-default port so we don't fail if someone is running an app now var proc = cp.spawn(meteor, ["--once", "--port", "4123"], {