Merge pull request #1780 from pjonsson/check-returnvalue

tests: ensure Cooja is built

arch/cpu/msp430/Makefile.msp430

@@ -219,7 +219,7 @@ $(COOJA_PATH)/mspsim/build.xml: $(COOJA_PATH)/build.xml
 	@echo '----------------'
 
 $(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
 	java -jar ${COOJA_PATH}/mspsim/mspsim.jar -platform=${TARGET} $<

arch/platform/cooja/Makefile.cooja

@@ -27,7 +27,7 @@ ifdef QUICKSTART
 # Create COOJA JAR rule
 $(COOJA_DIR)/dist/cooja.jar:
 	@echo "Creating COOJA Java archive..."
-	(cd $(COOJA_DIR) && ant jar)
+	cd $(COOJA_DIR) && ant jar
 
 # Quickstart rule
 ifneq ($(MAKECMDGOALS),clean)

tests/17-tun-rpl-br/Makefile

@@ -5,6 +5,6 @@ all: cooja
 cooja: $(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

tests/Makefile.simulation-test

@@ -56,4 +56,4 @@ clean:
 
 cooja: $(CONTIKI)/tools/cooja/dist/cooja.jar
 $(CONTIKI)/tools/cooja/dist/cooja.jar:
-	(cd $(CONTIKI)/tools/cooja; ant jar)
+	cd $(CONTIKI)/tools/cooja && ant jar