jstestnode: some cleanup

component/nodejs/buildout.cfg

@@ -57,15 +57,6 @@ environment =
   LDFLAGS=-Wl,-rpath=${:openssl_location}/lib -L${zlib:location}/lib -Wl,-rpath=${zlib:location}/lib
   LD_LIBRARY_PATH=${:openssl_location}/lib
 
-[nodejs-8.6.0-output]
-# Shared binary location to ease migration
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = ${coreutils-output:test} -x ${:node} -a -x ${:npm}
-node = ${nodejs-8.6.0:location}/bin/node
-npm = ${nodejs-8.6.0:location}/bin/npm
-
 [npm]
 # Node.js Package Manager
 # Deprecated. Included in node >= 0.6.3.

software/jstestnode/buildout.hash.cfg

@@ -27,4 +27,4 @@ md5sum = 98faa5ad8cfb23a11d97a459078a1d05
 
 [template-runTestSuite]
 filename = runTestSuite.in
-md5sum = 3e2fbde4b6a1cc202b5fd2a0f14413fd
+md5sum = 2e77a374f8c18cd77c50ee0f326aa97b

software/jstestnode/runTestSuite.in

@@ -69,7 +69,7 @@ def main():
     target = test_runner.get('target', 'firefox')
     if target == 'node':
       # Execute NodeJS tests
-      result_string = check_output(['${nodejs-output:node}', '${jio-repository.git:location}/test/node.js'],
+      result_string = check_output(['${nodejs:node}/bin/node', '${jio-repository.git:location}/test/node.js'],
                                    cwd='${jio-repository.git:location}',
                                    env={'CI': 'true'})
       result_dict = json.loads(result_string)

software/jstestnode/software.cfg

@@ -32,9 +32,6 @@ parts =
 [nodejs]
 <= nodejs-8.6.0
 
-[nodejs-output]
-<= nodejs-8.6.0-output
-
 [eggs]
 recipe = zc.recipe.egg
 eggs =
@@ -54,7 +51,11 @@ develop = true
 [renderjs-install]
 recipe = plone.recipe.command
 stop-on-error = true
-command = cd ${renderjs-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:${bzip2:location}/bin/:$PATH ${nodejs-output:npm} install . && PATH=${git:location}/bin/:${nodejs:location}/bin/:${bzip2:location}/bin/:$PATH ./node_modules/grunt-cli/bin/grunt
+command = set -e
+  cd ${renderjs-repository.git:location}
+  PATH=${git:location}/bin:${nodejs:location}/bin:${bzip2:location}/bin:$PATH
+  npm install .
+  ./node_modules/grunt-cli/bin/grunt
 update-command = ${:command}
 
 [jio-repository.git]
@@ -67,7 +68,11 @@ develop = true
 [jio-install]
 recipe = plone.recipe.command
 stop-on-error = true
-command = cd ${jio-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install jslint@0.9.2 jison@0.4.16 git://github.com/qunitjs/node-qunit.git#v0.9.3 sinon@1.7.3 && PATH=${curl:location}/bin/:${nodejs:location}/bin/:$PATH make
+command = set -e
+  cd ${jio-repository.git:location}
+  PATH=${git:location}/bin:${nodejs:location}/bin:$PATH
+  ${nodejs:location}/bin/npm install jslint@0.9.2 jison@0.4.16 git://github.com/qunitjs/node-qunit.git#v0.9.3 sinon@1.7.3
+  make
 update-command = ${:command}
 
 [rsvp-repository.git]
@@ -80,7 +85,10 @@ develop = true
 [rsvp-install]
 recipe = plone.recipe.command
 stop-on-error = true
-command = cd ${rsvp-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install .
+command = set -e
+  cd ${rsvp-repository.git:location}
+  PATH=${git:location}/bin:${nodejs:location}/bin:$PATH
+  npm install .
 update-command = ${:command}
 
 [uritemplate-repository.git]
@@ -93,7 +101,10 @@ develop = true
 [uritemplate-install]
 recipe = plone.recipe.command
 stop-on-error = true
-command = cd ${uritemplate-repository.git:location} && PATH=${git:location}/bin/:${nodejs:location}/bin/:$PATH ${nodejs:location}/bin/npm install .
+command = set -e
+  cd ${uritemplate-repository.git:location}
+  PATH=${git:location}/bin:${nodejs:location}/bin:$PATH
+  npm install .
 update-command = ${:command}
 
 [macro-template]