aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSalvador E. Tropea <salvador@inti.gob.ar>2016-10-13 17:57:09 -0300
committerSalvador E. Tropea <salvador@inti.gob.ar>2016-10-13 17:57:09 -0300
commit80749f174c83a3c52c6035a11ed8ed2bf1db0f91 (patch)
tree2167855465aa93e89ceab1d5d16d9b2d281788a6
parentcc8f29a1e60030dc81099c40a99a1f8731bbf114 (diff)
downloadyosys-80749f174c83a3c52c6035a11ed8ed2bf1db0f91.tar.gz
yosys-80749f174c83a3c52c6035a11ed8ed2bf1db0f91.tar.bz2
yosys-80749f174c83a3c52c6035a11ed8ed2bf1db0f91.zip
Ugh! extra patches got here, reverting
-rw-r--r--Makefile7
1 files changed, 3 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 9f16a4fb7..c3f225688 100644
--- a/Makefile
+++ b/Makefile
@@ -72,9 +72,8 @@ else
LDLIBS += -lrt
endif
-GIT_REV_WHERE ?= HEAD
YOSYS_VER := 0.6+$(shell test -e .git && { git log --author=clifford@clifford.at --oneline 5869d26da021.. | wc -l; })
-GIT_REV := $(shell cd $(YOSYS_SRC) && git rev-parse --short $(GIT_REV_WHERE) 2> /dev/null || echo UNKNOWN)
+GIT_REV := $(shell cd $(YOSYS_SRC) && git rev-parse --short HEAD 2> /dev/null || echo UNKNOWN)
OBJS = kernel/version_$(GIT_REV).o
# set 'ABCREV = default' to use abc/ as it is
@@ -411,7 +410,7 @@ else
SEEDOPT=""
endif
-test-all: $(TARGETS) $(EXTRA_TARGETS)
+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)
@@ -558,6 +557,6 @@ echo-git-rev:
-include kernel/*.d
-include techlibs/*/*.d
-.PHONY: all top-all abc test-all install install-abc manual clean mrproper qtcreator
+.PHONY: all top-all abc test install install-abc manual clean mrproper qtcreator
.PHONY: config-clean config-clang config-gcc config-gcc-4.8 config-gprof config-sudo