Skip to content
Snippets Groups Projects
Commit a026bed2 authored by dam1n19's avatar dam1n19
Browse files

Fixed warning in makefile with -j

parent e67c7094
No related branches found
No related tags found
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 18 additions and 18 deletions
makefile
+ 18
− 18
View file @ a026bed2
...@@ -205,7 +205,7 @@ define mti_template ...@@ -205,7 +205,7 @@ define mti_template
.PHONY: $(1) .PHONY: $(1)
mti_$(1): mti_$(1):
@echo Starting Test $(1) @echo Starting Test $(1)
@timeout $(TIMEOUT) $(MAKE) -j1 run_mti TESTNAME=$(1) > $$(REGRESSION)/$(1).log || true @timeout $(TIMEOUT) $$(MAKE) run_mti TESTNAME=$(1) > $$(REGRESSION)/$(1).log || true
@if cat $$(REGRESSION)/$(1).log | grep " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep " TEST SKIPPED "; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null @if cat $$(REGRESSION)/$(1).log | grep " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep " TEST SKIPPED "; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null
@echo Finished Test $(1) @echo Finished Test $(1)
endef endef
...@@ -214,7 +214,7 @@ define xm_template ...@@ -214,7 +214,7 @@ define xm_template
.PHONY: $(1) .PHONY: $(1)
xm_$(1): xm_$(1):
@echo Starting Test $(1) @echo Starting Test $(1)
@timeout $(TIMEOUT) $(MAKE) -j1 run_xm TESTNAME=$(1) > $$(REGRESSION)/$(1).log || true @timeout $(TIMEOUT) $$(MAKE) -j1 run_xm TESTNAME=$(1) > $$(REGRESSION)/$(1).log || true
@if cat $$(REGRESSION)/$(1).log | grep " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep " TEST SKIPPED "; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null @if cat $$(REGRESSION)/$(1).log | grep " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep " TEST SKIPPED "; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null
@echo Finished Test $(1) @echo Finished Test $(1)
endef endef
...@@ -223,7 +223,7 @@ define vcs_template ...@@ -223,7 +223,7 @@ define vcs_template
.PHONY: $(1) .PHONY: $(1)
vcs_$(1): vcs_$(1):
@echo Starting Test $(1) @echo Starting Test $(1)
@timeout $(TIMEOUT) $(MAKE) -j1 run_vcs TESTNAME=$(1) > $$(REGRESSION)/$(1).log || true @timeout $(TIMEOUT) $$(MAKE) -j1 run_vcs TESTNAME=$(1) > $$(REGRESSION)/$(1).log || true
@if cat $$(REGRESSION)/$(1).log | grep -i " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep -i " TEST SKIPPED "; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null @if cat $$(REGRESSION)/$(1).log | grep -i " TEST PASSED "; then echo "$(1): PASSED" >> $$(REGRESSION)/RESULTS.log; elif cat $$(REGRESSION)/$(1).log | grep -i " TEST SKIPPED "; then echo "$(1): SKIPPED"; else echo "$(1): FAILED" >> $$(REGRESSION)/RESULTS.log; fi > /dev/null
@echo Finished Test $(1) @echo Finished Test $(1)
endef endef
...@@ -295,12 +295,12 @@ run_xm : code compile_xm ...@@ -295,12 +295,12 @@ run_xm : code compile_xm
@echo exit >> $(SIM_DIR)/run.tcl.tmp @echo exit >> $(SIM_DIR)/run.tcl.tmp
@mv $(SIM_DIR)/run.tcl.tmp $(SIM_DIR)/run.tcl @mv $(SIM_DIR)/run.tcl.tmp $(SIM_DIR)/run.tcl
cd $(SIM_DIR); xmsim $(XMSIM_OPTIONS) -input run.tcl | tee logs/run_$(TESTNAME).log ; cd $(SIM_DIR); xmsim $(XMSIM_OPTIONS) -input run.tcl | tee logs/run_$(TESTNAME).log ;
# @make verify # @$(MAKE) verify
# Run simulation in interactive mode # Run simulation in interactive mode
sim_xm : code compile_xm sim_xm : code compile_xm
cd $(SIM_DIR); xmsim -gui $(XMSIM_OPTIONS) cd $(SIM_DIR); xmsim -gui $(XMSIM_OPTIONS)
# @make verify # @$(MAKE) verify
# ------- MTI ----------- # ------- MTI -----------
...@@ -362,8 +362,8 @@ regression_$(SIMULATOR): compile_$(SIMULATOR) bootrom debugtester ...@@ -362,8 +362,8 @@ regression_$(SIMULATOR): compile_$(SIMULATOR) bootrom debugtester
@echo -------------------------------------------- @echo --------------------------------------------
@echo Simulator: $(SIMULATOR) @echo Simulator: $(SIMULATOR)
@echo -------------------------------------------- @echo --------------------------------------------
@make -j$(PARALLEL_TESTS) all_$(SIMULATOR) REGRESSION=$(REGRESSION_DIR) @$(MAKE) -j$(PARALLEL_TESTS) all_$(SIMULATOR) REGRESSION=$(REGRESSION_DIR)
@make -j1 regression_results REGRESSION=$(REGRESSION_DIR) @$(MAKE) -j1 regression_results REGRESSION=$(REGRESSION_DIR)
defs_gen: defs_gen:
@mkdir -p $(DEFINES_DIR) @mkdir -p $(DEFINES_DIR)
...@@ -379,7 +379,7 @@ code : testcode bootrom debugtester ...@@ -379,7 +379,7 @@ code : testcode bootrom debugtester
# Note : The use of ls after compile allows the computing server to sync up # Note : The use of ls after compile allows the computing server to sync up
bootrom: bootrom:
@(cd $(TESTCODES_DIR)/$(BOOTLOADER) ;\ @(cd $(TESTCODES_DIR)/$(BOOTLOADER) ;\
make all $(SW_MAKE_OPTIONS) ;\ $(MAKE) all $(SW_MAKE_OPTIONS) ;\
echo Compile done ;\ echo Compile done ;\
ls > /dev/null ;\ ls > /dev/null ;\
echo Copy $(BOOTLOADER).hex ;\ echo Copy $(BOOTLOADER).hex ;\
...@@ -406,7 +406,7 @@ ifeq ($(TESTNAME),) ...@@ -406,7 +406,7 @@ ifeq ($(TESTNAME),)
endif endif
@(if [ -d "$(TESTCODES_DIR)/$(TESTNAME)" ] ; then \ @(if [ -d "$(TESTCODES_DIR)/$(TESTNAME)" ] ; then \
cd $(TESTCODES_DIR)/$(TESTNAME) ;\ cd $(TESTCODES_DIR)/$(TESTNAME) ;\
make all $(SW_MAKE_OPTIONS) ; \ $(MAKE) all $(SW_MAKE_OPTIONS) ; \
echo Compile done ;\ echo Compile done ;\
ls > /dev/null ;\ ls > /dev/null ;\
echo Copy $(TESTNAME).hex ;\ echo Copy $(TESTNAME).hex ;\
...@@ -432,7 +432,7 @@ endif ...@@ -432,7 +432,7 @@ endif
cd $(SIM_DIR) ;\ cd $(SIM_DIR) ;\
elif [ -d "$(PROJ_SW_DIR)/$(TESTNAME)" ] ; then \ elif [ -d "$(PROJ_SW_DIR)/$(TESTNAME)" ] ; then \
cd $(PROJ_SW_DIR)/$(TESTNAME) ;\ cd $(PROJ_SW_DIR)/$(TESTNAME) ;\
make all $(SW_MAKE_OPTIONS) ; \ $(MAKE) all $(SW_MAKE_OPTIONS) ; \
echo Compile done ;\ echo Compile done ;\
ls > /dev/null ;\ ls > /dev/null ;\
echo Copy $(TESTNAME).hex ;\ echo Copy $(TESTNAME).hex ;\
...@@ -466,7 +466,7 @@ endif ...@@ -466,7 +466,7 @@ endif
# Note : The use of ls after compile allows the computing server to sync up # Note : The use of ls after compile allows the computing server to sync up
debugtester: debugtester:
@(cd $(NANOSOC_SW_DIR)/debug_tester ;\ @(cd $(NANOSOC_SW_DIR)/debug_tester ;\
make all $(SW_MAKE_OPTIONS) ;\ $(MAKE) all $(SW_MAKE_OPTIONS) ;\
echo Compile done ;\ echo Compile done ;\
ls > /dev/null ;\ ls > /dev/null ;\
echo Copy $(DEBUGTESTER)_le.hex ;\ echo Copy $(DEBUGTESTER)_le.hex ;\
...@@ -509,7 +509,7 @@ compile_all_code: bootrom debugtester ...@@ -509,7 +509,7 @@ compile_all_code: bootrom debugtester
echo Compiling $$thistest ; \ echo Compiling $$thistest ; \
echo Removing old image.hex ;\ echo Removing old image.hex ;\
rm -f image.hex ;\ rm -f image.hex ;\
make testcode TESTNAME=$$thistest;\ $(MAKE) testcode TESTNAME=$$thistest;\
if [ -e $(SIM_DIR)/$$thistest/image.hex ] ; then \ if [ -e $(SIM_DIR)/$$thistest/image.hex ] ; then \
echo OK - image.hex created for test $$thistest ;\ echo OK - image.hex created for test $$thistest ;\
else \ else \
...@@ -520,24 +520,24 @@ compile_all_code: bootrom debugtester ...@@ -520,24 +520,24 @@ compile_all_code: bootrom debugtester
# Remove all software compilation results # Remove all software compilation results
clean_all_code: clean_all_code:
@(cd $(NANOSOC_SW_DIR)/debug_tester ; make clean; ) @(cd $(NANOSOC_SW_DIR)/debug_tester ; $(MAKE) clean; )
@(cd $(TESTCODES_DIR)/$(BOOTLOADER) ; make clean; ) @(cd $(TESTCODES_DIR)/$(BOOTLOADER) ; $(MAKE) clean; )
@for thistest in $(TEST_LIST) ; do \ @for thistest in $(TEST_LIST) ; do \
echo Cleaning $$thistest ... ; \ echo Cleaning $$thistest ... ; \
if [ -e $(TESTCODES_DIR)/$$thistest ]; then \ if [ -e $(TESTCODES_DIR)/$$thistest ]; then \
cd $(TESTCODES_DIR)/$$thistest ; \ cd $(TESTCODES_DIR)/$$thistest ; \
make clean; \ $(MAKE) clean; \
elif [ -e $(PROJ_SW_DIR)/$$thistest ]; then \ elif [ -e $(PROJ_SW_DIR)/$$thistest ]; then \
cd $(PROJ_SW_DIR)/$$thistest ; \ cd $(PROJ_SW_DIR)/$$thistest ; \
make clean; \ $(MAKE) clean; \
fi \ fi \
done done
@rm -rf $(BOOTROM_BUILD_DIR) @rm -rf $(BOOTROM_BUILD_DIR)
# Remove only bootloader and default selected test # Remove only bootloader and default selected test
clean_code: clean_code:
@(cd $(TESTCODES_DIR)/$(BOOTLOADER) ; make clean; cd $(SIM_DIR); ) @(cd $(TESTCODES_DIR)/$(BOOTLOADER) ; $(MAKE) clean; cd $(SIM_DIR); )
@(cd $(TESTCODES_DIR)/$(TESTNAME) ; make clean; cd $(SIM_DIR); ) @(cd $(TESTCODES_DIR)/$(TESTNAME) ; $(MAKE) clean; cd $(SIM_DIR); )
# ----- verification ------ # ----- verification ------
verify: verify:
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment