summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorKevin Krakauer <krakauer@google.com>2020-07-31 16:18:23 -0700
committergVisor bot <gvisor-bot@google.com>2020-07-31 16:20:35 -0700
commitfcc88a8b27ba1f7e572ebff00cf13460bdd4586b (patch)
treebb220036057df577d09f2d43647d18ca8aea3b43
parentfd5f4ffed1e425ec29d29477dc4e2a61420c1cf6 (diff)
Fix PHONY target typos
PiperOrigin-RevId: 324305107
-rw-r--r--.travis.yml2
-rw-r--r--Makefile8
2 files changed, 5 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml
index 1d955b05d..2d9fa80a1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -40,7 +40,7 @@ script:
# On arm64, we need to create our own pipes for stderr and stdout,
# otherwise we will not be able to open /dev/stderr. This is probably
# due to AppArmor rules.
- - bash -xeo pipefail -c 'uname -a && make smoke-test 2>&1 | cat'
+ - bash -xeo pipefail -c 'uname -a && make smoke-tests 2>&1 | cat'
branches:
except:
# Skip copybara branches.
diff --git a/Makefile b/Makefile
index d8135a082..5a9367de8 100644
--- a/Makefile
+++ b/Makefile
@@ -117,7 +117,7 @@ debian: ## Builds the debian packages.
@$(call submake,build OPTIONS="-c opt" TARGETS="//runsc:runsc-debian")
.PHONY: debian
-smoke-test: ## Runs a simple smoke test after build runsc.
+smoke-tests: ## Runs a simple smoke test after build runsc.
@$(call submake,run DOCKER_PRIVILEGED="" ARGS="--alsologtostderr --network none --debug --TESTONLY-unsafe-nonroot=true --rootless do true")
.PHONY: smoke-tests
@@ -218,7 +218,7 @@ packetimpact-tests: load-packetimpact
root-tests: load-basic-images
@$(call submake,install-test-runtime)
@$(call submake,sudo TARGETS="//test/root:root_test" ARGS="-test.v")
-.PHONY: test-root
+.PHONY: root-tests
# Specific containerd version tests.
containerd-test-%: load-basic_alpine load-basic_python load-basic_busybox load-basic_resolv load-basic_httpd install-test-runtime
@@ -266,7 +266,7 @@ website-push: website-build ## Push a new image and update the service.
website-deploy: website-push ## Deploy a new version of the website.
@gcloud run deploy $(WEBSITE_SERVICE) --platform=managed --region=$(WEBSITE_REGION) --project=$(WEBSITE_PROJECT) --image=$(WEBSITE_IMAGE)
-.PHONY: website-push
+.PHONY: website-deploy
##
## Repository builders.
@@ -349,7 +349,7 @@ dev: ## Installs a set of local runtimes. Requires sudo.
refresh: ## Refreshes the runtime binary (for development only). Must have called 'dev' or 'install-test-runtime' first.
@mkdir -p "$(RUNTIME_DIR)"
@$(call submake,copy TARGETS=runsc DESTINATION="$(RUNTIME_BIN)")
-.PHONY: install
+.PHONY: refresh
install-test-runtime: ## Installs the runtime for testing. Requires sudo.
@$(call submake,refresh ARGS="--net-raw --TESTONLY-test-name-env=RUNSC_TEST_NAME --debug --strace --log-packets $(ARGS)")