Skip to content

Commit

Permalink
Fix unittest cleanup
Browse files Browse the repository at this point in the history
-Fix NVM test cleanup
-Remove test results from the top level
  • Loading branch information
Arto Kinnunen committed Aug 1, 2019
1 parent d173249 commit 1da0b9f
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 14 deletions.
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ $(TESTDIRS):

$(CLEANTESTDIRS):
@make -C $(@:clean-%=%) clean
@rm -fr results

.PHONY: release
release:
Expand Down
22 changes: 8 additions & 14 deletions test/nanostack/unittest/thread/nvm/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,13 @@ TEST_SRC_FILES = \

include ../../MakefileWorker.mk

CLEAN-DIRS := $(foreach dir,$(DIRS),clean-$(dir))
clean: $(CLEAN-DIRS)
rm -rf stub/*gcov stub/*gcda stubs/*o
rm -rf results/*
rm -rf coverages/*
rm -rf results
rm -rf coverages
rm -rf lib/*
rm -rf objs/*
rm -f /tmp/fd.txt
clean:
rm -f f_d
rm -f s_d
rm -f cpputest_thread_nvm_store.xml
rm -f thread_nvm_store_unit_tests
rm -f thread_nvm_store_unit_tests
rm -f thread_nvm_store_unit_tests.txt

.PHONY: $(CLEAN-DIRS)
$(CLEAN-DIRS):
make -C $(subst clean-,,$@) clean
CPPUTESTFLAGS += -DFEA_TRACE_SUPPORT -DHAVE_THREAD

CPPUTESTFLAGS += -DFEA_TRACE_SUPPORT -DHAVE_THREAD=1

0 comments on commit 1da0b9f

Please sign in to comment.