Skip to content

an attempts at reducing false alarms by sorting oracle files and logs #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: coq-master
Choose a base branch
from
Open

an attempts at reducing false alarms by sorting oracle files and logs #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions Makefile.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,16 +171,16 @@ test-suite:
rm tests.ok

$(TESTDIR)/%.dpdusage.log: $(TESTDIR)/%.dpd $(DPDUSAGE)
$(DPDUSAGE) $< > $@
$(DPDUSAGE) $< | sort > $@

$(TESTDIR)/file_not_found.err.log: $(DPD2DOT)
$(DPD2DOT) file_not_found.err.dpd > $@ 2>&1
$(DPD2DOT) file_not_found.err.dpd | sort > $@ 2>&1

$(TESTDIR)/%.err.log: $(TESTDIR)/%.err.dpd $(DPD2DOT)
$(DPD2DOT) $< > $@ 2>&1
$(DPD2DOT) $< | sort > $@ 2>&1

%.log : %
cp $< $@
sort $< > $@

%.vo : %.v
coqc -q -R . dpdgraph $<
Expand Down Expand Up @@ -215,7 +215,7 @@ $(TESTDIR)/PrimitiveProjections.dpd $(TESTDIR)/PrimitiveProjections2.dpd: \

$(TESTDIR)/search.log : $(TESTDIR)/Test.vo $(TESTDIR)/search.cmd $(DPDPLUGIN)
cat $(TESTDIR)/search.cmd | coqtop -R . dpdgraph 2> /dev/null \
| sed -e 's/Welcome to Coq.*/Welcome to Coq/' > $@
| sed -e 's/Welcome to Coq.*/Welcome to Coq/' | sort > $@

%.dot : %.dpd $(DPD2DOT)
$(DPD2DOT) $< > /dev/null
Expand Down
54 changes: 27 additions & 27 deletions tests/Morph.dot.oracle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,37 +1,37 @@
digraph tests/Morph {
} /* END */
graph [ratio=0.5]
node [style=filled]
Morph_rw [label="rw", URL=<Morph.html#rw>, peripheries=3, fillcolor="#7FFFD4"] ;
Morph_FsmpM [label="FsmpM", URL=<Morph.html#FsmpM>, peripheries=3, fillcolor="#7FFFD4"] ;
Morph_FsmpM_Proper [label="FsmpM_Proper", URL=<Morph.html#FsmpM_Proper>, fillcolor="#FFB57F"] ;
Morph_Fsmp [label="Fsmp", URL=<Morph.html#Fsmp>, fillcolor="#FACDEF"] ;
Morph_Fequiv [label="Fequiv", URL=<Morph.html#Fequiv>, fillcolor="#FACDEF"] ;
Morph_Fequiv -> Morph_F [] ;
Morph_Fequiv_refl [label="Fequiv_refl", URL=<Morph.html#Fequiv_refl>, fillcolor="#FFB57F"] ;
Morph_Fequiv_refl -> Morph_Fequiv [] ;
Morph_FequivR [label="FequivR", URL=<Morph.html#FequivR>, fillcolor="#7FFFD4"] ;
Morph_FequivR_Transitive [label="FequivR_Transitive", URL=<Morph.html#FequivR_Transitive>, peripheries=3, fillcolor="#7FFFD4"] ;
Morph_FequivR_Symmetric [label="FequivR_Symmetric", URL=<Morph.html#FequivR_Symmetric>, peripheries=3, fillcolor="#7FFFD4"] ;
Morph_FequivR -> Morph_Fequiv_refl [] ;
Morph_FequivR -> Morph_Fequiv_sym [] ;
Morph_FequivR -> Morph_Fequiv_trans [] ;
Morph_FequivR_Reflexive [label="FequivR_Reflexive", URL=<Morph.html#FequivR_Reflexive>, peripheries=3, fillcolor="#7FFFD4"] ;
Morph_FequivR_Reflexive -> Morph_Fequiv_refl [] ;
Morph_FequivR_relation [label="FequivR_relation", URL=<Morph.html#FequivR_relation>, peripheries=3, fillcolor="#7FFFD4"] ;
Morph_Fequiv_trans [label="Fequiv_trans", URL=<Morph.html#Fequiv_trans>, fillcolor="#FFB57F"] ;
Morph_FequivR_relation -> Morph_Fequiv [] ;
Morph_FequivR_Symmetric [label="FequivR_Symmetric", URL=<Morph.html#FequivR_Symmetric>, peripheries=3, fillcolor="#7FFFD4"] ;
Morph_FequivR_Symmetric -> Morph_Fequiv_sym [] ;
Morph_FequivR_Transitive [label="FequivR_Transitive", URL=<Morph.html#FequivR_Transitive>, peripheries=3, fillcolor="#7FFFD4"] ;
Morph_FequivR_Transitive -> Morph_Fequiv_trans [] ;
Morph_Fequiv_sym [label="Fequiv_sym", URL=<Morph.html#Fequiv_sym>, fillcolor="#FFB57F"] ;
Morph_Fequiv_refl [label="Fequiv_refl", URL=<Morph.html#Fequiv_refl>, fillcolor="#FFB57F"] ;
Morph_Fequiv [label="Fequiv", URL=<Morph.html#Fequiv>, fillcolor="#FACDEF"] ;
Morph_Fequiv_sym -> Morph_Fequiv [] ;
Morph_Fequiv_trans [label="Fequiv_trans", URL=<Morph.html#Fequiv_trans>, fillcolor="#FFB57F"] ;
Morph_Fequiv_trans -> Morph_Fequiv [] ;
Morph_F [label="F", URL=<Morph.html#F>, fillcolor="#FACDEF"] ;
Morph_rw -> Morph_FsmpM_Proper [] ;
Morph_rw -> Morph_FequivR [] ;
Morph_F; Morph_Fequiv; Morph_Fequiv_refl; Morph_Fequiv_sym; Morph_Fequiv_trans; Morph_FequivR_relation; Morph_FequivR_Reflexive; Morph_FequivR_Symmetric; Morph_FequivR_Transitive; Morph_FequivR; Morph_Fsmp; Morph_FsmpM_Proper; Morph_FsmpM; Morph_rw; };
Morph_Fsmp [label="Fsmp", URL=<Morph.html#Fsmp>, fillcolor="#FACDEF"] ;
Morph_FsmpM [label="FsmpM", URL=<Morph.html#FsmpM>, peripheries=3, fillcolor="#7FFFD4"] ;
Morph_FsmpM -> Morph_FsmpM_Proper [] ;
Morph_FsmpM_Proper -> Morph_Fsmp [] ;
Morph_FsmpM_Proper -> Morph_Fequiv [] ;
Morph_Fsmp -> Morph_F [] ;
Morph_FequivR -> Morph_Fequiv_trans [] ;
Morph_FequivR -> Morph_Fequiv_sym [] ;
Morph_FequivR -> Morph_Fequiv_refl [] ;
Morph_FequivR_Transitive -> Morph_Fequiv_trans [] ;
Morph_FequivR_Symmetric -> Morph_Fequiv_sym [] ;
Morph_FequivR_Reflexive -> Morph_Fequiv_refl [] ;
Morph_FequivR_relation -> Morph_Fequiv [] ;
Morph_Fequiv_trans -> Morph_Fequiv [] ;
Morph_Fequiv_sym -> Morph_Fequiv [] ;
Morph_Fequiv_refl -> Morph_Fequiv [] ;
Morph_Fequiv -> Morph_F [] ;
Morph_FsmpM_Proper [label="FsmpM_Proper", URL=<Morph.html#FsmpM_Proper>, fillcolor="#FFB57F"] ;
Morph_FsmpM_Proper -> Morph_Fequiv [] ;
Morph_FsmpM_Proper -> Morph_Fsmp [] ;
Morph_rw [label="rw", URL=<Morph.html#rw>, peripheries=3, fillcolor="#7FFFD4"] ;
Morph_rw -> Morph_FequivR [] ;
Morph_rw -> Morph_FsmpM_Proper [] ;
node [style=filled]
subgraph cluster_Morph { label="Morph"; fillcolor="#FFFFC3"; labeljust=l; style=filled
Morph_F; Morph_Fequiv; Morph_Fequiv_refl; Morph_Fequiv_sym; Morph_Fequiv_trans; Morph_FequivR_relation; Morph_FequivR_Reflexive; Morph_FequivR_Symmetric; Morph_FequivR_Transitive; Morph_FequivR; Morph_Fsmp; Morph_FsmpM_Proper; Morph_FsmpM; Morph_rw; };
} /* END */
52 changes: 26 additions & 26 deletions tests/Morph.dpd.oracle
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,29 +1,22 @@
N: 14 "F" [body=no, kind=cnst, prop=no, path="Morph", ];
N: 13 "Fequiv" [body=no, kind=cnst, prop=no, path="Morph", ];
N: 5 "FequivR" [body=yes, kind=cnst, prop=yes, path="Morph", ];
N: 8 "FequivR_Reflexive" [body=yes, kind=cnst, prop=yes, path="Morph", ];
N: 7 "FequivR_Symmetric" [body=yes, kind=cnst, prop=yes, path="Morph", ];
N: 6 "FequivR_Transitive" [body=yes, kind=cnst, prop=yes, path="Morph", ];
N: 9 "FequivR_relation" [body=yes, kind=cnst, prop=yes, path="Morph", ];
N: 12 "Fequiv_refl" [body=no, kind=cnst, prop=yes, path="Morph", ];
N: 11 "Fequiv_sym" [body=no, kind=cnst, prop=yes, path="Morph", ];
N: 10 "Fequiv_trans" [body=no, kind=cnst, prop=yes, path="Morph", ];
N: 4 "Fsmp" [body=no, kind=cnst, prop=no, path="Morph", ];
N: 2 "FsmpM" [body=yes, kind=cnst, prop=yes, path="Morph", ];
N: 3 "FsmpM_Proper" [body=no, kind=cnst, prop=yes, path="Morph", ];
N: 1 "rw" [body=yes, kind=cnst, prop=yes, path="Morph", ];
E: 10 13 [weight=3, ];
E: 10 14 [weight=3, ];
E: 11 13 [weight=2, ];
E: 11 14 [weight=2, ];
E: 1 13 [weight=8, ];
E: 1 14 [weight=6, ];
E: 12 13 [weight=1, ];
E: 12 14 [weight=1, ];
E: 13 14 [weight=2, ];
E: 1 3 [weight=1, ];
E: 1 4 [weight=5, ];
E: 1 5 [weight=1, ];
E: 1 13 [weight=8, ];
E: 1 14 [weight=6, ];
E: 2 3 [weight=1, ];
E: 2 4 [weight=3, ];
E: 2 13 [weight=4, ];
E: 2 14 [weight=6, ];
E: 3 4 [weight=1, ];
E: 2 3 [weight=1, ];
E: 2 4 [weight=3, ];
E: 3 13 [weight=2, ];
E: 3 14 [weight=4, ];
E: 3 4 [weight=1, ];
E: 4 14 [weight=2, ];
E: 5 10 [weight=1, ];
E: 5 11 [weight=1, ];
Expand All @@ -41,10 +34,17 @@ E: 8 13 [weight=1, ];
E: 8 14 [weight=1, ];
E: 9 13 [weight=2, ];
E: 9 14 [weight=2, ];
E: 10 13 [weight=3, ];
E: 10 14 [weight=3, ];
E: 11 13 [weight=2, ];
E: 11 14 [weight=2, ];
E: 12 13 [weight=1, ];
E: 12 14 [weight=1, ];
E: 13 14 [weight=2, ];
N: 10 "Fequiv_trans" [body=no, kind=cnst, prop=yes, path="Morph", ];
N: 11 "Fequiv_sym" [body=no, kind=cnst, prop=yes, path="Morph", ];
N: 12 "Fequiv_refl" [body=no, kind=cnst, prop=yes, path="Morph", ];
N: 13 "Fequiv" [body=no, kind=cnst, prop=no, path="Morph", ];
N: 14 "F" [body=no, kind=cnst, prop=no, path="Morph", ];
N: 1 "rw" [body=yes, kind=cnst, prop=yes, path="Morph", ];
N: 2 "FsmpM" [body=yes, kind=cnst, prop=yes, path="Morph", ];
N: 3 "FsmpM_Proper" [body=no, kind=cnst, prop=yes, path="Morph", ];
N: 4 "Fsmp" [body=no, kind=cnst, prop=no, path="Morph", ];
N: 5 "FequivR" [body=yes, kind=cnst, prop=yes, path="Morph", ];
N: 6 "FequivR_Transitive" [body=yes, kind=cnst, prop=yes, path="Morph", ];
N: 7 "FequivR_Symmetric" [body=yes, kind=cnst, prop=yes, path="Morph", ];
N: 8 "FequivR_Reflexive" [body=yes, kind=cnst, prop=yes, path="Morph", ];
N: 9 "FequivR_relation" [body=yes, kind=cnst, prop=yes, path="Morph", ];
Loading