From: Miodrag Milanović <mmicko@gmail.com>
Date: Fri, 18 Oct 2019 08:52:50 +0000 (+0200)
Subject: Merge branch 'master' into eddie/pr1352
X-Git-Tag: working-ls180~989^2
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0b0b0cc0d9e432f14218bb9ed643af3d06ab43dc;p=yosys.git

Merge branch 'master' into eddie/pr1352
---

0b0b0cc0d9e432f14218bb9ed643af3d06ab43dc
diff --cc Makefile
index 227c87bbd,6f5184596..14af2bc11
--- a/Makefile
+++ b/Makefile
@@@ -714,7 -715,7 +715,8 @@@ test: $(TARGETS) $(EXTRA_TARGETS
  	+cd tests/arch && bash run-test.sh
  	+cd tests/ice40 && bash run-test.sh $(SEEDOPT)
  	+cd tests/rpc && bash run-test.sh
 +	+cd tests/ecp5 && bash run-test.sh $(SEEDOPT)
+ 	+cd tests/xilinx && bash run-test.sh $(SEEDOPT)
  	@echo ""
  	@echo "  Passed \"make test\"."
  	@echo ""