Skip to content
Snippets Groups Projects
Unverified Commit 1e02af4c authored by Nicolas Tsiftes's avatar Nicolas Tsiftes Committed by GitHub
Browse files

Merge pull request #1780 from pjonsson/check-returnvalue

tests: ensure Cooja is built
parents 8da8c081 751e685c
No related branches found
No related tags found
No related merge requests found
...@@ -219,7 +219,7 @@ $(COOJA_PATH)/mspsim/build.xml: $(COOJA_PATH)/build.xml ...@@ -219,7 +219,7 @@ $(COOJA_PATH)/mspsim/build.xml: $(COOJA_PATH)/build.xml
@echo '----------------' @echo '----------------'
$(COOJA_PATH)/mspsim/mspsim.jar: $(COOJA_PATH)/mspsim/build.xml $(COOJA_PATH)/mspsim/mspsim.jar: $(COOJA_PATH)/mspsim/build.xml
(cd $(COOJA_PATH)/mspsim && ant jar) cd $(COOJA_PATH)/mspsim && ant jar
%.mspsim: %.${TARGET} ${COOJA_PATH}/mspsim/mspsim.jar %.mspsim: %.${TARGET} ${COOJA_PATH}/mspsim/mspsim.jar
java -jar ${COOJA_PATH}/mspsim/mspsim.jar -platform=${TARGET} $< java -jar ${COOJA_PATH}/mspsim/mspsim.jar -platform=${TARGET} $<
......
...@@ -27,7 +27,7 @@ ifdef QUICKSTART ...@@ -27,7 +27,7 @@ ifdef QUICKSTART
# Create COOJA JAR rule # Create COOJA JAR rule
$(COOJA_DIR)/dist/cooja.jar: $(COOJA_DIR)/dist/cooja.jar:
@echo "Creating COOJA Java archive..." @echo "Creating COOJA Java archive..."
(cd $(COOJA_DIR) && ant jar) cd $(COOJA_DIR) && ant jar
# Quickstart rule # Quickstart rule
ifneq ($(MAKECMDGOALS),clean) ifneq ($(MAKECMDGOALS),clean)
......
...@@ -5,6 +5,6 @@ all: cooja ...@@ -5,6 +5,6 @@ all: cooja
cooja: $(CONTIKI)/tools/cooja/dist/cooja.jar cooja: $(CONTIKI)/tools/cooja/dist/cooja.jar
$(CONTIKI)/tools/cooja/dist/cooja.jar: $(CONTIKI)/tools/cooja/dist/cooja.jar:
(cd $(CONTIKI)/tools/cooja; ant jar) cd $(CONTIKI)/tools/cooja && ant jar
include ../Makefile.script-test include ../Makefile.script-test
...@@ -56,4 +56,4 @@ clean: ...@@ -56,4 +56,4 @@ clean:
cooja: $(CONTIKI)/tools/cooja/dist/cooja.jar cooja: $(CONTIKI)/tools/cooja/dist/cooja.jar
$(CONTIKI)/tools/cooja/dist/cooja.jar: $(CONTIKI)/tools/cooja/dist/cooja.jar:
(cd $(CONTIKI)/tools/cooja; ant jar) cd $(CONTIKI)/tools/cooja && ant jar
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment