[fix] Fetch correct nodeos-barebones architecture for pretest script

Author: piranna

package.json

@@ -27,6 +27,11 @@
     "nodeos-nodejs",
     "usrbinenv"
   ],
+  "testDependencies": [
+    "nodeos-barebones",
+    "qemu",
+    "suppose"
+  ],
   "devDependencies": {
     "exclfs": "piranna/exclfs",
     "jocker": "^0.0.0",

scripts/BigRedButton

@@ -10,9 +10,9 @@ BUILD="npm run build --no-spin"
 TEST="npm test"
 
 
-eval MACHINE=pc BITS=32 $BUILD && MACHINE=pc BITS=32  $TEST || exit 1
-eval MACHINE=pc BITS=64 $BUILD && MACHINE=pc BITS=64  $TEST || exit 2
-eval MACHINE=raspi2     $BUILD                              || exit 3
+eval MACHINE=pc BITS=32 $BUILD && MACHINE=pc BITS=32 $TEST || exit 1
+eval MACHINE=pc BITS=64 $BUILD && MACHINE=pc BITS=64 $TEST || exit 2
+eval MACHINE=raspi2     $BUILD                             || exit 3
 
 
 #

scripts/build

@@ -22,6 +22,9 @@ PATH=$TOOLCHAIN/bin:$PATH
 (
   cd $TOOLCHAIN
 
+  # We can't use `--arch=$NODE_ARCH` because `prebuild` would install a
+  # cross-compiler for a diferent host platform, so we set the desired target
+  # platform using environment variables instead
   BITS=$BITS CPU=$CPU MACHINE=$MACHINE npm install --production || exit 1
 ) || exit $?
 

scripts/pretest

@@ -1,8 +1,16 @@
 #!/usr/bin/env bash
 
+TOOLCHAIN=`node -p "require('nodeos-cross-toolchain')"`
+BAREBONES=`node -p "require('nodeos-barebones')"`
 
-npm install nodeos-barebones qemu suppose
 
-cd `node -p "require('nodeos-barebones')"`
+source $TOOLCHAIN/scripts/adjustEnvVars.sh || exit $?
 
-npm install --production
+
+buildDependencies testDependencies || exit 1
+
+(
+  cd $BAREBONES || exit 2
+
+  npm install --arch=$NODE_ARCH --production || exit 3
+) || exit $?