summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorChristian Breunig <christian@breunig.cc>2024-06-26 22:34:47 +0200
committerGitHub <noreply@github.com>2024-06-26 22:34:47 +0200
commit8e633a944aa64f8507afc85e0b548cc0b1ed997a (patch)
tree687e982f5c4b2d5301f5112aecc4eb23227a47e3 /Makefile
parent67ba5d6e37abe4d8cfd73ba91de15d3236a5c7f9 (diff)
parent33d4f8adb85fbf5e3b279ef59f1d2f113639e62f (diff)
downloadvyos-1x-8e633a944aa64f8507afc85e0b548cc0b1ed997a.tar.gz
vyos-1x-8e633a944aa64f8507afc85e0b548cc0b1ed997a.zip
Merge pull request #3727 from c-po/T6510-smoketesting
T6510: smoketest: generell improvement task for the smoketesting platform
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile19
1 files changed, 6 insertions, 13 deletions
diff --git a/Makefile b/Makefile
index 509b47858..1e0a12714 100644
--- a/Makefile
+++ b/Makefile
@@ -78,18 +78,7 @@ vyshim:
$(MAKE) -C $(SHIM_DIR)
.PHONY: all
-all: clean interface_definitions op_mode_definitions check test j2lint vyshim check_migration_scripts_executable
-
-.PHONY: check
-.ONESHELL:
-check:
- @echo "Checking which CLI scripts are not enabled to work with vyos-configd..."
- @for file in `ls src/conf_mode -I__pycache__`
- do
- if ! grep -q $$file data/configd-include.json; then
- echo "* $$file"
- fi
- done
+all: clean interface_definitions op_mode_definitions test j2lint vyshim check_migration_scripts_executable generate-configd-include-json
.PHONY: clean
clean:
@@ -99,7 +88,7 @@ clean:
$(MAKE) -C $(SHIM_DIR) clean
.PHONY: test
-test:
+test: generate-configd-include-json
set -e; python3 -m compileall -q -x '/vmware-tools/scripts/, /ppp/' .
PYTHONPATH=python/ python3 -m "nose" --with-xunit src --with-coverage --cover-erase --cover-xml --cover-package src/conf_mode,src/op_mode,src/completion,src/helpers,src/validators,src/tests --verbose
@@ -127,6 +116,10 @@ unused-imports:
deb:
dpkg-buildpackage -uc -us -tc -b
+.PHONY: generate-configd-include-json
+generate-configd-include-json:
+ @scripts/generate-configd-include-json.py
+
.PHONY: schema
schema:
trang -I rnc -O rng schema/interface_definition.rnc schema/interface_definition.rng