From 73c20345e98c11d0d629e818f89ff8a84de6d615 Mon Sep 17 00:00:00 2001 From: Charles Gagnon Date: Thu, 2 Sep 2021 16:52:09 -0700 Subject: [PATCH] Revert change to unit test runner grep option (#16980) --- scripts/test-unstable.bat | 2 +- scripts/test-unstable.sh | 2 +- test/unit/electron/renderer.js | 5 ++--- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/scripts/test-unstable.bat b/scripts/test-unstable.bat index 54f69bcb1c..7f88d63b09 100644 --- a/scripts/test-unstable.bat +++ b/scripts/test-unstable.bat @@ -1,7 +1,7 @@ @echo off setlocal -set "ADS_TEST_GREP=(@UNSTABLE@|Unexpected Errors & Loader Errors)" +set "ADS_TEST_GREP=/(@UNSTABLE@|Unexpected Errors & Loader Errors)/" set ADS_TEST_INVERT_GREP= echo Running UNSTABLE ADS Core Tests diff --git a/scripts/test-unstable.sh b/scripts/test-unstable.sh index daf6f1aed4..d654a26b9b 100644 --- a/scripts/test-unstable.sh +++ b/scripts/test-unstable.sh @@ -12,7 +12,7 @@ fi cd $ROOT -export ADS_TEST_GREP=@UNSTABLE@ +export ADS_TEST_GREP=/(@UNSTABLE@|Unexpected Errors & Loader Errors)/ export ADS_TEST_INVERT_GREP= echo Running UNSTABLE ADS Core Tests diff --git a/test/unit/electron/renderer.js b/test/unit/electron/renderer.js index b04b059601..2e740b385e 100644 --- a/test/unit/electron/renderer.js +++ b/test/unit/electron/renderer.js @@ -296,10 +296,9 @@ function runTests(opts) { } return loadTests(opts).then(() => { - if (opts.grep) { - // {{SQL CARBON EDIT}} - mocha.grep(new RegExp(opts.grep)); + mocha.grep(opts.grep); + // {{SQL CARBON EDIT}} Add invert option if (opts.invert) { mocha.invert(); }