Browse code
Pass no focus spec in `make test-extended` when unset
The current implementation of the extended test setup and focus
mechanism is to honor user-provided `--ginkgo.focus` strings over
anything that can be inferred from which specific extended test bucket
is being run. This means that, for instance:
$ make test-extended SUITE=conformance FOCUS=pods
Will run ALL Ginkgo tests that relate to `pods`, not just conformance
tests that do. This means that:
$ make test-extended SUITE=conformance FOCUS="."
Cannot be used as a no-op focus to grab all conformance tests. We can't
default the focus to `.`, then, and need to entirely omit the argument
if no test focus is requested.
Signed-off-by: Steve Kuznetsov <skuznets@redhat.com>
Steve Kuznetsov authored on 2016/12/17 00:31:26Showing 1 changed files
| ... | ... |
@@ -174,9 +174,13 @@ endif |
| 174 | 174 |
# make test-extended SUITE=core |
| 175 | 175 |
# make test-extended SUITE=conformance FOCUS=pods |
| 176 | 176 |
SUITE ?= conformance |
| 177 |
-FOCUS ?= . |
|
| 177 |
+ifneq ($(strip $(FOCUS)),) |
|
| 178 |
+ FOCUS_ARG=--ginkgo.focus="$(FOCUS)" |
|
| 179 |
+else |
|
| 180 |
+ FOCUS_ARG= |
|
| 181 |
+endif |
|
| 178 | 182 |
test-extended: |
| 179 |
- test/extended/$(SUITE).sh --ginkgo.focus="$(FOCUS)" |
|
| 183 |
+ test/extended/$(SUITE).sh $(FOCUS_ARG) |
|
| 180 | 184 |
.PHONY: test-extended |
| 181 | 185 |
|
| 182 | 186 |
# Build and run the complete test-suite. |