diff options
| author |  Jason Gross <jgross@mit.edu> | 2018-05-22 15:38:02 -0400 |
|---|---|---|
| committer | Jason Gross <jgross@mit.edu> | 2018-05-25 22:18:46 -0400 |
| commit | 9531a44ecf57181c954ec41e66819899276c00c4 (patch) | |
| tree | 9de1de121fee98b8e2b312d4da19d3b9a4843722 | |
| parent | c792c9fc500cbc1cab14271ebc6a98cd516451b3 (diff) | |
Allow make clean to work on a fresh clone
The file `config/Makefile` doesn't exist unless we run `./configure`.
We shouldn't have to run `./configure` to run `make clean`. We now no
longer error in any case if `config/Makefile` doesn't exist; this is
simpler than only not erroring if the target is `clean`.
We also now test this property when building on CI.
This fixes #7542
| -rw-r--r-- | .circleci/config.yml | 4 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 8 | ||||
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | test-suite/Makefile | 2 |
4 files changed, 17 insertions, 1 deletions
diff --git a/.circleci/config.yml b/.circleci/config.yml index 4d2fb1a4d..5a9f1f5d5 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -32,6 +32,10 @@ before_script: &before_script steps: - checkout - run: *before_script + - run: &build-clean + name: Clean + command: | + make clean # ensure that `make clean` works on a fresh clone - run: &build-configure name: Configure command: | diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 4784f0db0..05d2c635a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -60,6 +60,10 @@ before_script: script: - set -e + - echo 'start:coq.clean' + - make clean # ensure that `make clean` works on a fresh clone + - echo 'end:coq.clean' + - echo 'start:coq.config' - ./configure -prefix "$(pwd)/_install_ci" ${COQ_EXTRA_CONF}"$COQ_EXTRA_CONF_QUOTE" - echo 'end:coq.config' @@ -84,6 +88,10 @@ before_script: script: - set -e + - echo 'start:coq.clean' + - make clean # ensure that `make clean` works on a fresh clone + - echo 'end:coq.clean' + - echo 'start:coq.config' - ./configure -local ${COQ_EXTRA_CONF} - echo 'end:coq.config' diff --git a/.travis.yml b/.travis.yml index 8218467d2..5c7fc5a33 100644 --- a/.travis.yml +++ b/.travis.yml @@ -281,6 +281,10 @@ install: script: - set -e +- echo 'Testing make clean...' && echo -en 'travis_fold:start:coq.clean\\r' +- make clean # ensure that `make clean` works on a fresh clone +- echo -en 'travis_fold:end:coq.clean\\r' + - echo 'Configuring Coq...' && echo -en 'travis_fold:start:coq.config\\r' - ./configure ${COQ_DEST} -native-compiler ${NATIVE_COMP} ${EXTRA_CONF} - echo -en 'travis_fold:end:coq.config\\r' diff --git a/test-suite/Makefile b/test-suite/Makefile index ce21ff41c..f41fb5b1e 100644 --- a/test-suite/Makefile +++ b/test-suite/Makefile @@ -25,7 +25,7 @@ # Includes ########################################################################### -include ../config/Makefile +-include ../config/Makefile include ../Makefile.common ####################################################################### |