Skip to content

fix(make): make test and test-cfs shell-free for Windows make #10

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benweru merged 1 commit into from
Oct 16, 2026
Merged

fix(make): make test and test-cfs shell-free for Windows make #10

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 6 additions & 5 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,9 @@ ifeq ($(OS),Windows_NT)
else
VPY := $(VENV)/bin/python
endif
# Pure make (no shell syntax) so recipes also work with make on Windows/PowerShell:
# the venv python if it exists, otherwise $(PYTHON).
RUN_PY := $(if $(wildcard $(VPY) $(VPY).exe),$(VPY),$(PYTHON))

.PHONY: setup test test-cfs quick reproduce clean cfs-build cfs-up cfs-logs cfs-down

Expand All @@ -15,10 +18,10 @@ setup:
$(VPY) -m pip install -e .

test:
@if [ -x "$(VPY)" ]; then $(VPY) -m pytest -q -m "not cfs and not docker and not linux_i2c"; else $(PYTHON) -m pytest -q -m "not cfs and not docker and not linux_i2c"; fi
$(RUN_PY) -m pytest -q -m "not cfs and not docker and not linux_i2c"

test-cfs:
@if [ -x "$(VPY)" ]; then $(VPY) -m pytest -q -m cfs; else $(PYTHON) -m pytest -q -m cfs; fi
$(RUN_PY) -m pytest -q -m cfs

quick:
@echo "make quick: not yet implemented (target: 3 configs x 10 cases, <30 min on a laptop)."
Expand Down Expand Up @@ -47,9 +50,7 @@ cfs-down:

N ?= 30
SEED ?= 0
# Pure make (no shell syntax) so it also works with make on Windows/PowerShell.
# Windows equivalent without make: .venv\Scripts\python -m orbitlog.build_dataset --n 6 --seed 0
DATASET_PY := $(if $(wildcard $(VPY) $(VPY).exe),$(VPY),$(PYTHON))
.PHONY: dataset
dataset:
$(DATASET_PY) -m orbitlog.build_dataset --n $(N) --seed $(SEED)
$(RUN_PY) -m orbitlog.build_dataset --n $(N) --seed $(SEED)
Loading