From 0fdc7435d8b3666b17a9270375f5377fa340a773 Mon Sep 17 00:00:00 2001
From: Pierre Roux
Date: Sat, 14 Mar 2020 18:42:54 +0100
Subject: Fix coq-makefile/native1 test

This was accidentaly disabled by #6264 when no_native_compiler was
renamed to native_compiler.

Moreover, the (then unactivated test) was broken by commit 48ae6ce
(part of #9088).
---
 .gitlab-ci.yml                         | 5 +++--
 test-suite/Makefile                    | 3 ++-
 test-suite/coq-makefile/native1/run.sh | 4 ++--
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8b79dbf810..2581b25715 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -69,6 +69,7 @@ before_script:
       - _install_ci
       - config/Makefile
       - config/coq_config.py
+      - config/coq_config.ml
       - test-suite/misc/universes/all_stdlib.v
     expire_in: 1 week
   script:
@@ -172,7 +173,7 @@ before_script:
     - BIN=$(readlink -f ../_install_ci/bin)/
     - LIB=$(readlink -f ../_install_ci/lib/coq)/
     - export OCAMLPATH=$(readlink -f ../_install_ci/lib/):"$OCAMLPATH"
-    - make -j "$NJOBS" BIN="$BIN" COQLIB="$LIB" COQFLAGS="${COQFLAGS}" all
+    - COQEXTRAFLAGS="${COQEXTRAFLAGS}" make -j "$NJOBS" BIN="$BIN" COQLIB="$LIB" all
   artifacts:
     name: "$CI_JOB_NAME.logs"
     when: on_failure
@@ -531,7 +532,7 @@ test-suite:base+async:
   needs:
     - build:base
   variables:
-    COQFLAGS: "-async-proofs on -async-proofs-cache force"
+    COQEXTRAFLAGS: "-async-proofs on -async-proofs-cache force"
   timeout: 100m
   allow_failure: true
   only:
diff --git a/test-suite/Makefile b/test-suite/Makefile
index 1681150f7b..3703d97c88 100644
--- a/test-suite/Makefile
+++ b/test-suite/Makefile
@@ -49,7 +49,8 @@ endif
 endif # exists ../_build
 export COQLIB
 
-COQFLAGS?=
+COQEXTRAFLAGS?=
+COQFLAGS?=$(COQEXTRAFLAGS)
 
 coqc := $(BIN)coqc -q -R prerequisite TestSuite $(COQFLAGS)
 coqchk := $(BIN)coqchk -R prerequisite TestSuite
diff --git a/test-suite/coq-makefile/native1/run.sh b/test-suite/coq-makefile/native1/run.sh
index 8f9ab9a711..3ffe831b3c 100755
--- a/test-suite/coq-makefile/native1/run.sh
+++ b/test-suite/coq-makefile/native1/run.sh
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-NATIVECOMP=$(grep "let no_native_compiler = false" ../../../config/coq_config.ml)||true
-if [[ $(which ocamlopt) && $NATIVECOMP ]]; then
+NONATIVECOMP=$(grep "let native_compiler = false" ../../../config/coq_config.ml)||true
+if [[ $(which ocamlopt) && ! $NONATIVECOMP ]]; then
 
 . ../template/init.sh
 
-- 
cgit v1.2.3