summaryrefslogtreecommitdiff
path: root/scripts/rspec_helpers.sh
diff options
context:
space:
mode:
authorGitLab Bot <gitlab-bot@gitlab.com>2021-09-06 12:11:14 +0000
committerGitLab Bot <gitlab-bot@gitlab.com>2021-09-06 12:11:14 +0000
commitab7ca19e6844c37a715e378801409e297fd51512 (patch)
treecc09891376cf53f63fd17bb6f739295620cf1ac1 /scripts/rspec_helpers.sh
parentaea64c367b180ea549aa115d8312b7c1832bc0b3 (diff)
downloadgitlab-ce-ab7ca19e6844c37a715e378801409e297fd51512.tar.gz
Add latest changes from gitlab-org/gitlab@master
Diffstat (limited to 'scripts/rspec_helpers.sh')
-rw-r--r--scripts/rspec_helpers.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/rspec_helpers.sh b/scripts/rspec_helpers.sh
index 797d9188f81..4fc62038d4f 100644
--- a/scripts/rspec_helpers.sh
+++ b/scripts/rspec_helpers.sh
@@ -159,7 +159,7 @@ function rspec_paralellized_job() {
local rspec_args="-Ispec -rspec_helper --color --format documentation --format RspecJunitFormatter --out junit_rspec.xml ${rspec_opts}"
- if [[ -n $RSPEC_TESTS_MAPPING_ENABLED ]]; then
+ if [[ -n $MINIMAL_RSPEC_ENABLED ]]; then
tooling/bin/parallel_rspec --rspec_args "${rspec_args}" --filter "tmp/matching_tests.txt"
else
tooling/bin/parallel_rspec --rspec_args "${rspec_args}"