Run tests during build

Build-depend and depend on a newer version of berkeley-abc

4 files changed, 9 insertions, 61 deletions

diff --git a/debian/changelog b/debian/changelog
index b76618a3..010d7c50 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,12 @@ yosys (0.7-1) UNRELEASED; urgency=medium
   * Refreshed patches. Some patches applied upstream and deleted.
   * Updated man page for yosys
   * Simplified debian/*.install files
+  * debian/patches/03_notruntests.patch deleted
+    - Tests can now be run during buidl since an updated version
+      of iverilog is in the archive
+  * debian/control:
+    - Depend on a newer version of berkeley-abc
+    - Build-depend on iverilog >= 10.1
 
  -- Ruben Undheim <ruben.undheim@gmail.com>  Thu, 03 Nov 2016 23:21:50 +0100
 
diff --git a/debian/control b/debian/control
index 1ef00dd3..9f5ee53a 100644
--- a/debian/control
+++ b/debian/control
@@ -14,6 +14,7 @@ Build-Depends: debhelper (>= 9),
                libffi-dev,
                pkg-config,
                txt2man,
+               iverilog (>= 10.1),
                python3
 Build-Depends-Indep:
                texlive-base,
@@ -28,7 +29,7 @@ Build-Depends-Indep:
                texlive-bibtex-extra,
                lmodern,
                graphviz,
-               berkeley-abc (>= 1.01)
+               berkeley-abc (>= 1.01+20161002hgeb6eca6+dfsg)
 Standards-Version: 3.9.8
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-science/packages/yosys.git
 Vcs-Git: https://anonscm.debian.org/git/debian-science/packages/yosys.git
@@ -39,7 +40,7 @@ Architecture: any
 Depends: ${shlibs:Depends},
          ${python3:Depends},
          ${misc:Depends},
-         berkeley-abc (>= 1.01),
+         berkeley-abc (>= 1.01+20161002hgeb6eca6+dfsg),
          xdot
 Description: Framework for Verilog RTL synthesis
  This is a framework for Verilog RTL synthesis. It currently has extensive
diff --git a/debian/patches/03_notruntests.patch b/debian/patches/03_notruntests.patch
deleted file mode 100644
index 3c677c23..00000000
--- a/debian/patches/03_notruntests.patch
+++ /dev/null
@@ -1,58 +0,0 @@
-From: Ruben Undheim <ruben.undheim@gmail.com>
-Date: Sat, 14 May 2016 15:44:13 +0200
-Subject: Do not run the long test suite when building for debian.
-
-Forwarded: doesn't make sense upstream
----
- Makefile | 32 ++++++++++++++++----------------
- 1 file changed, 16 insertions(+), 16 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index f26a6e0..cbbd878 100644
---- a/Makefile
-+++ b/Makefile
-@@ -412,21 +412,21 @@ else
- SEEDOPT=""
- endif
- 
--test: $(TARGETS) $(EXTRA_TARGETS)
--	+cd tests/simple && bash run-test.sh $(SEEDOPT)
--	+cd tests/hana && bash run-test.sh $(SEEDOPT)
--	+cd tests/asicworld && bash run-test.sh $(SEEDOPT)
--	+cd tests/realmath && bash run-test.sh $(SEEDOPT)
--	+cd tests/share && bash run-test.sh $(SEEDOPT)
--	+cd tests/fsm && bash run-test.sh $(SEEDOPT)
--	+cd tests/techmap && bash run-test.sh
--	+cd tests/memories && bash run-test.sh $(SEEDOPT)
--	+cd tests/bram && bash run-test.sh $(SEEDOPT)
--	+cd tests/various && bash run-test.sh
--	+cd tests/sat && bash run-test.sh
--	@echo ""
--	@echo "  Passed \"make test\"."
--	@echo ""
-+#test: $(TARGETS) $(EXTRA_TARGETS)
-+#	+cd tests/simple && bash run-test.sh $(SEEDOPT)
-+#	+cd tests/hana && bash run-test.sh $(SEEDOPT)
-+#	+cd tests/asicworld && bash run-test.sh $(SEEDOPT)
-+#	+cd tests/realmath && bash run-test.sh $(SEEDOPT)
-+#	+cd tests/share && bash run-test.sh $(SEEDOPT)
-+#	+cd tests/fsm && bash run-test.sh $(SEEDOPT)
-+#	+cd tests/techmap && bash run-test.sh
-+#	+cd tests/memories && bash run-test.sh $(SEEDOPT)
-+#	+cd tests/bram && bash run-test.sh $(SEEDOPT)
-+#	+cd tests/various && bash run-test.sh
-+#	+cd tests/sat && bash run-test.sh
-+#	@echo ""
-+#	@echo "  Passed \"make test\"."
-+#	@echo ""
- 
- VALGRIND ?= valgrind --error-exitcode=1 --leak-check=full --show-reachable=yes --errors-for-leak-kinds=all
- 
-@@ -559,6 +559,6 @@ echo-git-rev:
- -include kernel/*.d
- -include techlibs/*/*.d
- 
--.PHONY: all top-all abc test install install-abc manual clean mrproper qtcreator
-+.PHONY: all top-all abc install install-abc manual clean mrproper qtcreator
- .PHONY: config-clean config-clang config-gcc config-gcc-4.8 config-gprof config-sudo
- 
diff --git a/debian/patches/series b/debian/patches/series
index d0361e97..168b0e56 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 01_gitrevision.patch
 02_removeabc.patch
-03_notruntests.patch
 05_abc_executable.patch
 switch-to-free-font.patch
 manual-build.patch