From e253e9c03cb4e05b7dbe4ee0ff93346a5c2b2171 Mon Sep 17 00:00:00 2001 From: "Lucas, John P." Date: Wed, 31 Jul 2024 14:35:59 -0400 Subject: [PATCH] [nasa/nos3#176] Added hwlib stubs to CMakeLists for unit-tests, resolved errors in current tests, added build-test command to iterate faster on specific tests; --- Makefile | 10 ++++++---- components/sample | 2 +- fsw/apps/hwlib | 2 +- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 5f85a585..b7c8c3bf 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ endif # The "LOCALTGTS" defines the top-level targets that are implemented in this makefile # Any other target may also be given, in that case it will simply be passed through. -LOCALTGTS := all checkout clean clean-fsw clean-sim clean-gsw config debug fsw gsw launch log prep real-clean sim stop stop-gsw test-fsw +LOCALTGTS := all checkout clean clean-fsw clean-sim clean-gsw config debug fsw gsw launch log prep real-clean sim stop stop-gsw OTHERTGTS := $(filter-out $(LOCALTGTS),$(MAKECMDGOALS)) # As this makefile does not build any real files, treat everything as a PHONY target @@ -61,6 +61,11 @@ build-sim: cd $(SIMBUILDDIR) && cmake -DCMAKE_INSTALL_PREFIX=$(SIMBUILDDIR) .. $(MAKE) --no-print-directory -C $(SIMBUILDDIR) install +build-test: + mkdir -p $(FSWBUILDDIR) + cd $(FSWBUILDDIR) && cmake $(PREP_OPTS) -DENABLE_UNIT_TESTS=true ../cfe + $(MAKE) --no-print-directory -C $(FSWBUILDDIR) mission-install + checkout: ./scripts/docker_checkout.sh @@ -119,9 +124,6 @@ stop-gsw: ./scripts/stop_gsw.sh test-fsw: - mkdir -p $(FSWBUILDDIR) - cd $(FSWBUILDDIR) && cmake $(PREP_OPTS) -DENABLE_UNIT_TESTS=true ../cfe - $(MAKE) --no-print-directory -C $(FSWBUILDDIR) mission-install cd $(FSWBUILDDIR)/amd64-posix/default_cpu1 && ctest -O ctest.log igniter: diff --git a/components/sample b/components/sample index bf8dd3df..75e69a93 160000 --- a/components/sample +++ b/components/sample @@ -1 +1 @@ -Subproject commit bf8dd3df09d4542b8784ca6e7b91dfef646aea10 +Subproject commit 75e69a935ebc69fe0543dcce0fa82a792c4401f9 diff --git a/fsw/apps/hwlib b/fsw/apps/hwlib index f3143f23..f2e180cc 160000 --- a/fsw/apps/hwlib +++ b/fsw/apps/hwlib @@ -1 +1 @@ -Subproject commit f3143f23926c64a8683a89991b263f0c9b1c8aeb +Subproject commit f2e180cc30a883660ec70a3fb5391f4eb86a2f29