fix issue w/ loadtest executable - macbook

ammarm08 · Feb 20, 2017 · 1d2cd91 · 1d2cd91
1 parent 0005b10
commit 1d2cd91
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 6 deletions.
diff --git a/lib/config.js b/lib/config.js
@@ -24,7 +24,7 @@ config.default_commands = {
   sleep: 'sleep 5',
   process_node_logs: `node --prof-process ./isolate-*`,
   testdir_cleanup: `rm -rf ./isolate-* ${config.default_dir}/*.txt`,
-  path_import: 'source ~/.bashrc && source ~/.profile && LOADTEST=$(npm bin)/loadtest',
+  path_import: 'source ~/.bashrc; source ~/.profile',
   check_dependencies: config.functions.checkDependency('$(npm bin)/loadtest')
 };
 
@@ -33,7 +33,7 @@ config.clock = {
 };
 
 config.loadtest = {
-  program: '$LOADTEST',
+  program: '$(npm bin)/loadtest',
   bindings: {
     'concurrency': '-c',
     'requests': '-n',

diff --git a/lib/utils.js b/lib/utils.js
@@ -8,11 +8,9 @@ const config = require('./config'),
 const utils = module.exports = exports = {};
 
 // Platform specific dependencies
-if (process.platform === 'linux') {
-  config.default_commands.check_dependencies = config.functions.checkDependency('$(npm bin)/loadtest');
-} else {
+if (process.platform !== 'linux') {
   config.clock.program = 'gtime --verbose';
-  config.default_commands.check_dependencies = [config.functions.checkDependency('$(npm bin)/loadtest'), config.functions.checkDependency('gtime')].join('\n');
+  config.default_commands.check_dependencies += '\n' + config.functions.checkDependency('gtime');
 }
 
 /**