From f406263fc262ee00cb6b0e3bcd5b277fb4c020a9 Mon Sep 17 00:00:00 2001
From: Jonas Jenwald <jonas.jenwald@gmail.com>
Date: Wed, 18 Dec 2019 21:26:44 +0100
Subject: [PATCH] Re-factor the `npm test` command, used by Travis, to avoid
 running the 'default_preferences' tasks concurrently (issue 10732)

*Please note:* This patch does *not* prevent the 'default_preferences' task from running more than once during `npm test`, but it does ensure that the tasks won't run *concurrently* by running the relevant tests in *series*.

While it would obviously still make sense to re-factor the gulpfile to account for changes in `gulp` version 4, by at least tweaking the `npm test` command the intermittent failures on Travis should at least go away.
---
 gulpfile.js  | 3 +++
 package.json | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/gulpfile.js b/gulpfile.js
index 7651f6cb0..6558a6618 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -1502,3 +1502,6 @@ gulp.task('externaltest', function (done) {
                 { stdio: 'inherit', });
   done();
 });
+
+gulp.task('npm-test', gulp.series(gulp.parallel('lint', 'externaltest'),
+                                  'unittestcli'));
diff --git a/package.json b/package.json
index c46b89fa9..06fe30cb4 100644
--- a/package.json
+++ b/package.json
@@ -54,7 +54,7 @@
     "yargs": "^11.1.1"
   },
   "scripts": {
-    "test": "env SKIP_BABEL=true gulp lint unittestcli externaltest"
+    "test": "env SKIP_BABEL=true gulp npm-test"
   },
   "repository": {
     "type": "git",