@@ -39,6 +39,10 @@ CONNECT_IMAGE ?= rstudio/rstudio-connect
3939DOCKER_COMPOSE ?= docker compose
4040PYTHON ?= python3
4141
42+ clean :
43+ rm -rf logs reports
44+ find . -type d -empty -delete
45+
4246# Run test suite for a specific Connect version.
4347#
4448# Matches any version defined in CONNECT_VERSIONS.
@@ -108,12 +112,11 @@ help:
108112 @echo " Makefile Targets:"
109113 @echo " all (default) Run test suite for all Connect versions."
110114 @echo " latest Run test suite for latest Connect version."
111- @echo " preview Run test suite for preview Connect version."
115+ @echo " preview Run test suite for preview Connect version."
112116 @echo " <version> Run test suite for the specified Connect version. (e.g., make 2024.05.0)"
113- @echo " down Tear down Docker resources for all Connect versions."
114- @echo " down-<version> Tear down Docker resources for specific Connect version (e.g., make down-2024.05.0)."
115117 @echo " up Start Docker Compose for all Connect version."
116- @echo " up-<version> Start Docker Compose for specific Connect version (e.g., make up-2024.05.0)."
118+ @echo " down Tear down Docker resources for all Connect versions."
119+ @echo " clean Clean up the project directory."
117120 @echo " help Show this help message."
118121 @echo
119122 @echo " Common Usage:"
@@ -127,4 +130,5 @@ help:
127130# Typically call from docker-compose.yaml. Assumes Connect server is running
128131# on local network.
129132test :
130- CONNECT_VERSION=${CONNECT_VERSION} CONNECT_API_KEY=" $( shell rsconnect bootstrap -i -s http://connect:3939 --raw) " $(PYTHON ) -m pytest --junit-xml=./reports/$(CONNECT_VERSION ) .xml
133+ mkdir -p logs
134+ CONNECT_VERSION=${CONNECT_VERSION} CONNECT_API_KEY=" $( shell rsconnect bootstrap -i -s http://connect:3939 --raw) " $(PYTHON ) -m pytest --junit-xml=./reports/$(CONNECT_VERSION ) .xml > ./logs/$(CONNECT_VERSION ) .log
0 commit comments