diff options
| author | Théo Zimmermann | 2018-09-03 18:15:45 +0200 |
|---|---|---|
| committer | Théo Zimmermann | 2018-09-03 18:15:45 +0200 |
| commit | 063abf16bc4e66019f1d60e9f42deeeb9a17d8d5 (patch) | |
| tree | df03b5232d4a18f4242cdc3dcd66cfc62e56ef41 | |
| parent | f61ee79e4a6db070e3bf26f76e8bdb42b85c3a72 (diff) | |
| parent | 81ed24a15d78415e9524fd81323e728bae0450f5 (diff) | |
Merge PR #8387: Make -compat 8.8 import Coq.Compat.Coq88
| -rw-r--r-- | test-suite/success/CompatCurrentFlag.v | 3 | ||||
| -rw-r--r-- | test-suite/success/CompatOldFlag.v | 5 | ||||
| -rw-r--r-- | test-suite/success/CompatPreviousFlag.v | 4 | ||||
| -rw-r--r-- | toplevel/coqargs.ml | 2 |
4 files changed, 13 insertions, 1 deletions
diff --git a/test-suite/success/CompatCurrentFlag.v b/test-suite/success/CompatCurrentFlag.v new file mode 100644 index 0000000000..288c9d1da0 --- /dev/null +++ b/test-suite/success/CompatCurrentFlag.v @@ -0,0 +1,3 @@ +(* -*- coq-prog-args: ("-compat" "8.8") -*- *) +(** Check that the current compatibility flag actually requires the relevant modules. *) +Import Coq.Compat.Coq88. diff --git a/test-suite/success/CompatOldFlag.v b/test-suite/success/CompatOldFlag.v new file mode 100644 index 0000000000..b7bbc505b4 --- /dev/null +++ b/test-suite/success/CompatOldFlag.v @@ -0,0 +1,5 @@ +(* -*- coq-prog-args: ("-compat" "8.6") -*- *) +(** Check that the current-minus-two compatibility flag actually requires the relevant modules. *) +Import Coq.Compat.Coq88. +Import Coq.Compat.Coq87. +Import Coq.Compat.Coq86. diff --git a/test-suite/success/CompatPreviousFlag.v b/test-suite/success/CompatPreviousFlag.v new file mode 100644 index 0000000000..9cfe60390f --- /dev/null +++ b/test-suite/success/CompatPreviousFlag.v @@ -0,0 +1,4 @@ +(* -*- coq-prog-args: ("-compat" "8.7") -*- *) +(** Check that the current-minus-one compatibility flag actually requires the relevant modules. *) +Import Coq.Compat.Coq88. +Import Coq.Compat.Coq87. diff --git a/toplevel/coqargs.ml b/toplevel/coqargs.ml index 113ba3684c..98a28bb2b6 100644 --- a/toplevel/coqargs.ml +++ b/toplevel/coqargs.ml @@ -154,7 +154,7 @@ let add_compat_require opts v = match v with | Flags.V8_6 -> add_vo_require opts "Coq.Compat.Coq86" None (Some false) | Flags.V8_7 -> add_vo_require opts "Coq.Compat.Coq87" None (Some false) - | Flags.Current -> opts + | Flags.Current -> add_vo_require opts "Coq.Compat.Coq88" None (Some false) let set_batch_mode opts = Flags.quiet := true; |