Skip to content

Commit a4d2d76

Browse files
committed
Makefile: switch test/subcommand/* to test-subcommand-*
1 parent 8b21bbd commit a4d2d76

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -132,13 +132,13 @@ jobs:
132132
- if: tag IS present OR branch != master
133133
<<: *test
134134
name: Subcommands on Kubernetes
135-
script: make test/subcommand
135+
script: make test-subcommand
136136

137137
# Test olm install/uninstall subcommands on master, as these cannot be tested in prow/api-ci.
138138
- if: tag IS NOT present AND branch = master
139139
<<: *test
140140
name: OLM Install/Uninstall on Kubernetes
141-
script: make test/subcommand/olm-install
141+
script: make test-subcommand-olm-install
142142

143143
# Build and test ansible using molecule, as this cannot be tested in prow/api-ci.
144144
- if: tag IS NOT present AND branch = master

Makefile

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -122,20 +122,20 @@ test-unit: ## Run the unit tests
122122
# CI tests.
123123
.PHONY: test-ci
124124

125-
test-ci: test-markdown test-sanity test-unit install test/subcommand test/e2e ## Run the CI test suite
125+
test-ci: test-markdown test-sanity test-unit install test-subcommand test/e2e ## Run the CI test suite
126126

127127
# Subcommand tests.
128-
.PHONY: test/subcommand test/subcommand/test-local test/subcommand/scorecard test/subcommand/olm-install
128+
.PHONY: test-subcommand test-subcommand-local test-subcommand-scorecard test-subcommand-olm-install
129129

130-
test/subcommand: test/subcommand/test-local test/subcommand/scorecard test/subcommand/olm-install
130+
test-subcommand: test-subcommand-local test-subcommand-scorecard test-subcommand-olm-install
131131

132-
test/subcommand/test-local:
132+
test-subcommand-local:
133133
./hack/tests/subcommand.sh
134134

135-
test/subcommand/scorecard:
135+
test-subcommand-scorecard:
136136
./hack/tests/subcommand-scorecard.sh
137137

138-
test/subcommand/olm-install:
138+
test-subcommand-olm-install:
139139
./hack/tests/subcommand-olm-install.sh
140140

141141
# E2E tests.

ci/prow.Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@ test/e2e/ansible:
1616
test/e2e/helm:
1717
./ci/tests/e2e-helm.sh
1818

19-
test/subcommand:
19+
test-subcommand:
2020
./ci/tests/subcommand.sh

doc/dev/testing/running-the-tests.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ All the tests are run through the [`Makefile`][makefile]. This is a brief descri
5757
- `test-ci` - Runs markdown, sanity, and unit tests, installs the SDK binary, and runs the SDK subcommand and all E2E tests.
5858
- `test-sanity` - Runs sanity checks.
5959
- `test-unit` - Runs unit tests.
60-
- `test/subcommand` - Runs subcommand tests.
60+
- `test-subcommand` - Runs subcommand tests.
6161
- `test/e2e` - Runs all E2E tests (`test/e2e/go`, `test/e2e/ansible`, `test/e2e/ansible-molecule`, and `e2e/helm`).
6262
- `test/e2e/go` - Runs the go E2E test.
6363
- `test/e2e/ansible` - Runs the ansible E2E test.

0 commit comments

Comments
 (0)