From d25d761b556d01f903782db1070fb0300c83c661 Mon Sep 17 00:00:00 2001 From: Lovell Fuller Date: Fri, 14 Jul 2017 13:18:13 +0100 Subject: [PATCH] Update benchmark deps, allow node-images to fail --- test/bench/package.json | 8 ++++---- test/bench/perf.js | 31 ++++++++++++++++++++----------- 2 files changed, 24 insertions(+), 15 deletions(-) diff --git a/test/bench/package.json b/test/bench/package.json index 2ffc99e3..5976d75b 100644 --- a/test/bench/package.json +++ b/test/bench/package.json @@ -8,14 +8,14 @@ "test": "node perf && node random && node parallel" }, "devDependencies": { - "async": "^2.1.4", - "benchmark": "^2.1.2", + "async": "^2.5.0", + "benchmark": "^2.1.4", "gm": "^1.23.0", "imagemagick": "^0.1.3", "imagemagick-native": "^1.9.3", "images": "^3.0.0", - "jimp": "^0.2.27", - "mapnik": "^3.6.0", + "jimp": "^0.2.28", + "mapnik": "^3.6.2", "pajk-lwip": "^0.2.0", "semver": "^5.3.0" }, diff --git a/test/bench/perf.js b/test/bench/perf.js index 680310ae..0a0739b3 100644 --- a/test/bench/perf.js +++ b/test/bench/perf.js @@ -12,7 +12,12 @@ const gm = require('gm'); const imagemagick = require('imagemagick'); const mapnik = require('mapnik'); const jimp = require('jimp'); -const images = require('images'); +let images; +try { + images = require('images'); +} catch (err) { + console.log('Excluding node-images'); +} let imagemagickNative; try { imagemagickNative = require('imagemagick-native'); @@ -268,11 +273,13 @@ async.series({ } }); // images - jpegSuite.add('images-file-file', function () { - images(fixtures.inputJpg) - .resize(width, height) - .save(fixtures.outputJpg, { quality: 80 }); - }); + if (typeof images !== 'undefined') { + jpegSuite.add('images-file-file', function () { + images(fixtures.inputJpg) + .resize(width, height) + .save(fixtures.outputJpg, { quality: 80 }); + }); + } // sharp jpegSuite.add('sharp-buffer-file', { defer: true, @@ -827,11 +834,13 @@ async.series({ } }); // images - pngSuite.add('images-file-file', function () { - images(fixtures.inputPng) - .resize(width, height) - .save(fixtures.outputPng); - }); + if (typeof images !== 'undefined') { + pngSuite.add('images-file-file', function () { + images(fixtures.inputPng) + .resize(width, height) + .save(fixtures.outputPng); + }); + } // sharp pngSuite.add('sharp-buffer-file', { defer: true,