diff options
| author | Enrico Tassi | 2019-05-29 13:09:07 +0200 |
|---|---|---|
| committer | Enrico Tassi | 2019-05-29 13:09:07 +0200 |
| commit | d47b279c2b0510535ef6f1affe23c7fab812c745 (patch) | |
| tree | 473977a856b5bb3273fda348775c39a4cb3f78b1 | |
| parent | d62215a4c06680d2052238544b9e31422f512eaf (diff) | |
| parent | 356f496f16219c5e3bd9a651b867c48411bde17d (diff) | |
Merge PR #10270: Fix debug printers
Reviewed-by: gares
| -rw-r--r-- | dev/base_include | 2 | ||||
| -rw-r--r-- | test-suite/Makefile | 1 | ||||
| -rwxr-xr-x | test-suite/misc/printers.sh | 8 |
3 files changed, 8 insertions, 3 deletions
diff --git a/dev/base_include b/dev/base_include index b214959bad..f764eaf4f5 100644 --- a/dev/base_include +++ b/dev/base_include @@ -185,7 +185,7 @@ open Declareops;; let constbody_of_string s = let b = Global.lookup_constant (Nametab.locate_constant (qualid_of_string s)) in - Option.get (Global.body_of_constant_body b);; + Option.get (Global.body_of_constant_body Library.indirect_accessor b);; (* Get the current goal *) (* diff --git a/test-suite/Makefile b/test-suite/Makefile index 94011447d7..552d007f85 100644 --- a/test-suite/Makefile +++ b/test-suite/Makefile @@ -561,7 +561,6 @@ $(patsubst %.sh,%.log,$(wildcard misc/*.sh)): %.log: %.sh $(PREREQUISITELOG) export coqc="$(coqc)"; \ export coqtop="$(coqc)"; \ export coqdep="$(coqdep)"; \ - export coqtopbyte="$(coqtopbyte)"; \ "$<" 2>&1; R=$$?; times; \ if [ $$R = 0 ]; then \ echo $(log_success); \ diff --git a/test-suite/misc/printers.sh b/test-suite/misc/printers.sh index ef3f056d89..f659fce680 100755 --- a/test-suite/misc/printers.sh +++ b/test-suite/misc/printers.sh @@ -1,2 +1,8 @@ #!/bin/sh -if printf "Drop. #use\"include\";; #quit;;\n" | $coqtopbyte 2>&1 | grep -E "Error|Unbound" ; then exit 1; else exit 0; fi + +command -v "${BIN}coqtop.byte" || { echo "Missing coqtop.byte"; exit 1; } + +f=$(mktemp) +printf 'Drop. #use"include";; #quit;;\n' | "${BIN}coqtop.byte" -q 2>&1 | tee "$f" + +if grep -q -E "Error|Unbound" "$f"; then exit 1; fi |