Skip to content

Commit 1da0b9f

Browse files
author
Arto Kinnunen
committed
Fix unittest cleanup
-Fix NVM test cleanup -Remove test results from the top level
1 parent d173249 commit 1da0b9f

File tree

2 files changed

+9
-14
lines changed

2 files changed

+9
-14
lines changed

Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ $(TESTDIRS):
6565

6666
$(CLEANTESTDIRS):
6767
@make -C $(@:clean-%=%) clean
68+
@rm -fr results
6869

6970
.PHONY: release
7071
release:

test/nanostack/unittest/thread/nvm/Makefile

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,13 @@ TEST_SRC_FILES = \
1717

1818
include ../../MakefileWorker.mk
1919

20-
CLEAN-DIRS := $(foreach dir,$(DIRS),clean-$(dir))
21-
clean: $(CLEAN-DIRS)
22-
rm -rf stub/*gcov stub/*gcda stubs/*o
23-
rm -rf results/*
24-
rm -rf coverages/*
25-
rm -rf results
26-
rm -rf coverages
27-
rm -rf lib/*
28-
rm -rf objs/*
29-
rm -f /tmp/fd.txt
20+
clean:
21+
rm -f f_d
22+
rm -f s_d
23+
rm -f cpputest_thread_nvm_store.xml
24+
rm -f thread_nvm_store_unit_tests
25+
rm -f thread_nvm_store_unit_tests
26+
rm -f thread_nvm_store_unit_tests.txt
3027

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

35-
CPPUTESTFLAGS += -DFEA_TRACE_SUPPORT -DHAVE_THREAD=1

0 commit comments

Comments
 (0)