tasks: use common module in container tasks

Author: etpinard

tasks/baseline.js

@@ -1,12 +1,9 @@
-var exec = require('child_process').exec;
+var common = require('./util/common');
 var containerCommands = require('./util/container_commands');
 
-var cmd = containerCommands([
-    containerCommands.setup,
+var cmd = containerCommands.getRunCmd(
+    process.env.CIRCLECI,
     'node test/image/make_baseline.js ' + process.argv.slice(2).join(' ')
-]);
+);
 
-exec(cmd, function(err) {
-    if(err) throw err;
-})
-.stdout.pipe(process.stdout);
+common.execCmd(cmd);

tasks/test_bundle.js

@@ -1,9 +1,8 @@
 var path = require('path');
-var exec = require('child_process').exec;
-
 var glob = require('glob');
 
 var constants = require('./util/constants');
+var common = require('./util/common');
 var pathToJasmineBundleTests = path.join(constants.pathToJasmineBundleTests);
 
 
@@ -12,10 +11,6 @@ glob(pathToJasmineBundleTests + '/*.js', function(err, files) {
         var baseName = path.basename(file);
         var cmd = 'npm run citest-jasmine -- bundle_tests/' + baseName;
 
-        exec(cmd, function(err, stdout) {
-            console.log(stdout);
-
-            if(err) throw err;
-        });
+        common.execCmd(cmd);
     });
 });

tasks/test_export.js

@@ -1,12 +1,9 @@
-var exec = require('child_process').exec;
+var common = require('./util/common');
 var containerCommands = require('./util/container_commands');
 
-var cmd = containerCommands[process.env.CIRCLECI ? 'runCI' : 'runLocal']([
-    containerCommands.setup,
+var cmd = containerCommands.getRunCmd(
+    process.env.CIRCLECI,
     'node test/image/export_test.js ' + process.argv.slice(2).join(' ')
-]);
+);
 
-exec(cmd, function(err) {
-    if(err) throw err;
-})
-.stdout.pipe(process.stdout);
+common.execCmd(cmd);

tasks/test_image.js

@@ -1,12 +1,9 @@
-var exec = require('child_process').exec;
+var common = require('./util/common');
 var containerCommands = require('./util/container_commands');
 
-var cmd = containerCommands[process.env.CIRCLECI ? 'runCI' : 'runLocal']([
-    containerCommands.setup,
+var cmd = containerCommands.getRunCmd(
+    process.env.CIRCLECI,
     'node test/image/compare_pixels_test.js ' + process.argv.slice(2).join(' ')
-]);
+);
 
-exec(cmd, function(err) {
-    if(err) throw err;
-})
-.stdout.pipe(process.stdout);
+common.execCmd(cmd);