From 00dfe2be53ddc84836e095f0a20a0efdebc87f50 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Mon, 12 Feb 2018 10:32:01 -0500 Subject: coq_makefile: Support "" as the prefix in _CoqProject This fixes #6350 (and even comes with a test case). Refering to other directories as `-R … ""` is maybe not best practice, but some people out there do it, so as long as it does not cause too much trouble, we can continue to support it. --- test-suite/coq-makefile/emptyprefix/_CoqProject | 11 +++++++++++ test-suite/coq-makefile/emptyprefix/_CoqProject.sub | 3 +++ test-suite/coq-makefile/emptyprefix/run.sh | 17 +++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 test-suite/coq-makefile/emptyprefix/_CoqProject create mode 100644 test-suite/coq-makefile/emptyprefix/_CoqProject.sub create mode 100755 test-suite/coq-makefile/emptyprefix/run.sh (limited to 'test-suite/coq-makefile') diff --git a/test-suite/coq-makefile/emptyprefix/_CoqProject b/test-suite/coq-makefile/emptyprefix/_CoqProject new file mode 100644 index 0000000000..5678a8edbb --- /dev/null +++ b/test-suite/coq-makefile/emptyprefix/_CoqProject @@ -0,0 +1,11 @@ +-R theories "" +-R src "" +-I src +-arg "-w default" + +src/test_plugin.mlpack +src/test.ml4 +src/test.mli +src/test_aux.ml +src/test_aux.mli +theories/test.v diff --git a/test-suite/coq-makefile/emptyprefix/_CoqProject.sub b/test-suite/coq-makefile/emptyprefix/_CoqProject.sub new file mode 100644 index 0000000000..90ac541e04 --- /dev/null +++ b/test-suite/coq-makefile/emptyprefix/_CoqProject.sub @@ -0,0 +1,3 @@ +-R ../theories "" +-I ../src +testsub.v diff --git a/test-suite/coq-makefile/emptyprefix/run.sh b/test-suite/coq-makefile/emptyprefix/run.sh new file mode 100755 index 0000000000..a10e63b42e --- /dev/null +++ b/test-suite/coq-makefile/emptyprefix/run.sh @@ -0,0 +1,17 @@ +#!/usr/bin/env bash + +set -e + +. ../template/init.sh + +mv theories/sub theories2 + +coq_makefile -f _CoqProject -o Makefile +cat Makefile.conf +make + +cp ../_CoqProject.sub theories2/_CoqProject +cd theories2 +coq_makefile -f _CoqProject -o Makefile +cat Makefile.conf +make -- cgit v1.2.3