Commit 93abe70d authored by POTTIER Francois's avatar POTTIER Francois
Browse files

Removed the part of the Makefile that dealt with missing .expected

files -- it was apparently dead, since all .expected files are here.
parent e5d5d9e6
...@@ -26,6 +26,9 @@ test: clean $(RESULTS) ...@@ -26,6 +26,9 @@ test: clean $(RESULTS)
exit 1; \ exit 1; \
fi fi
# The file %.result stores the output of menhir --only-preprocess.
# The file %.expected stores its expected output.
%.result: %.mly %.result: %.mly
@ if echo $< | grep -e "-1.mly" &> /dev/null; then \ @ if echo $< | grep -e "-1.mly" &> /dev/null; then \
export BASE=`echo $< | sed s/"-1.mly"/""/`; \ export BASE=`echo $< | sed s/"-1.mly"/""/`; \
...@@ -45,7 +48,7 @@ test: clean $(RESULTS) ...@@ -45,7 +48,7 @@ test: clean $(RESULTS)
if $(MENHIR) $$CMD >& /dev/null; then \ if $(MENHIR) $$CMD >& /dev/null; then \
echo "[OK] $$FILES"; \ echo "[OK] $$FILES"; \
else \ else \
echo "-> [KO] menhir failed on $$FILES"; \ echo "-> [KO] menhir failed on $$FILES"; \
export FAILED_FILES="$$FAILED_FILES $$FILES"; \ export FAILED_FILES="$$FAILED_FILES $$FILES"; \
fi; \ fi; \
else \ else \
...@@ -53,16 +56,7 @@ test: clean $(RESULTS) ...@@ -53,16 +56,7 @@ test: clean $(RESULTS)
echo " $$FILES" >> failed_files; \ echo " $$FILES" >> failed_files; \
fi; \ fi; \
else \ else \
if echo $< | grep -e "-should-compile" &> /dev/null; then \ echo "Warning: missing file $*.expected"; \
$(SHELL) -c '$(MENHIR) $$CMD >& $@'; \
if $(CAMLC) -c $$BASE.mli; $(CAMLC) -c $$BASE.ml; then \
echo "[OK] $$FILES"; \
else \
echo "-> [KO] menhir back-end failed on $$FILES"; \
fi; \
else \
echo "[OK] $$FILES"; \
fi; \
fi; \ fi; \
expected: expected:
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment