Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 20 additions & 0 deletions .github/workflows/workflow.yml
Original file line number Diff line number Diff line change
Expand Up @@ -270,6 +270,26 @@ jobs:
# We disable the Dune cache when running the tests
DUNE_CACHE: disabled

rocq:
name: Rocq 9.1.0
needs: nix-build
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v5
- uses: nixbuild/nix-quick-install-action@v34
with:
nix_conf: ${{ env.EXTRA_NIX_CONFIG }}
- uses: nix-community/cache-nix-action@v6
with:
primary-key: |
nix-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/*.nix', '**/flake.lock') }}
restore-prefixes-first-match: nix-${{ runner.os }}-${{ github.job }}-
gc-max-store-size-linux: 5G
- run: nix develop .#rocq -c make test-coq
env:
# We disable the Dune cache when running the tests
DUNE_CACHE: disabled

wasm:
name: Wasm_of_ocaml
needs: nix-build
Expand Down
30 changes: 30 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,14 @@
];
});
})
(self: super: {
coq_9_1_native = super.coq_9_1.overrideAttrs (a: {
configureFlags = [
"-native-compiler"
"yes"
];
});
})
];

applyOxcamlPatches = import ./nix/ox-patches.nix {
Expand Down Expand Up @@ -353,6 +361,28 @@
'';
};

rocq = pkgs.mkShell {
inherit INSIDE_NIX;
nativeBuildInputs = (testNativeBuildInputs pkgs);
# Coq requires OCaml 4.x
inputsFrom = [
pkgs.ocaml-ng.ocamlPackages_4_14.dune_3
];
buildInputs = with pkgs; [
ocaml-ng.ocamlPackages_4_14.csexp
ocaml-ng.ocamlPackages_4_14.pp
ocaml-ng.ocamlPackages_4_14.re
ocaml-ng.ocamlPackages_4_14.spawn
ocaml-ng.ocamlPackages_4_14.uutf
coq_9_1_native
coq_9_1_native.ocamlPackages.findlib
];
meta.description = ''
Provides a minimal shell environment built purely from nixpkgs
that can build Dune and the Rocq testsuite.
'';
};

bootstrap-check = pkgs.mkShell {
inherit INSIDE_NIX;
buildInputs = with pkgs; [
Expand Down
84 changes: 42 additions & 42 deletions test/blackbox-tests/test-cases/coq/coqtop/coqtop-flags.t/run.t
Original file line number Diff line number Diff line change
Expand Up @@ -12,27 +12,27 @@ The flags passed to coqc:
-native-compiler on
-nI lib/coq-core/kernel
-nI .
-I lib/coq/../coq-core/plugins/btauto
-I lib/coq/../coq-core/plugins/cc
-I lib/coq/../coq-core/plugins/derive
-I lib/coq/../coq-core/plugins/extraction
-I lib/coq/../coq-core/plugins/firstorder
-I lib/coq/../coq-core/plugins/funind
-I lib/coq/../coq-core/plugins/ltac
-I lib/coq/../coq-core/plugins/ltac2
-I lib/coq/../coq-core/plugins/micromega
-I lib/coq/../coq-core/plugins/nsatz
-I lib/coq/../coq-core/plugins/number_string_notation
-I lib/coq/../coq-core/plugins/ring
-I lib/coq/../coq-core/plugins/rtauto
-I lib/coq/../coq-core/plugins/ssreflect
-I lib/coq/../coq-core/plugins/ssrmatching
-I lib/coq/../coq-core/plugins/tauto
-I lib/coq/../coq-core/plugins/tutorial/p0
-I lib/coq/../coq-core/plugins/tutorial/p1
-I lib/coq/../coq-core/plugins/tutorial/p2
-I lib/coq/../coq-core/plugins/tutorial/p3
-I lib/coq/../coq-core/plugins/zify
-I .../plugins/btauto
-I .../plugins/cc
-I .../plugins/derive
-I .../plugins/extraction
-I .../plugins/firstorder
-I .../plugins/funind
-I .../plugins/ltac
-I .../plugins/ltac2
-I .../plugins/micromega
-I .../plugins/nsatz
-I .../plugins/number_string_notation
-I .../plugins/ring
-I .../plugins/rtauto
-I .../plugins/ssreflect
-I .../plugins/ssrmatching
-I .../plugins/tauto
-I .../plugins/tutorial/p0
-I .../plugins/tutorial/p1
-I .../plugins/tutorial/p2
-I .../plugins/tutorial/p3
-I .../plugins/zify
-R coq/theories Coq
-R . minimal
Test.v
Expand All @@ -49,26 +49,26 @@ The flags passed to coqtop:
-native-compiler on
-nI lib/coq-core/kernel
-nI $TESTCASE_ROOT/_build/default
-I lib/coq/../coq-core/plugins/btauto
-I lib/coq/../coq-core/plugins/cc
-I lib/coq/../coq-core/plugins/derive
-I lib/coq/../coq-core/plugins/extraction
-I lib/coq/../coq-core/plugins/firstorder
-I lib/coq/../coq-core/plugins/funind
-I lib/coq/../coq-core/plugins/ltac
-I lib/coq/../coq-core/plugins/ltac2
-I lib/coq/../coq-core/plugins/micromega
-I lib/coq/../coq-core/plugins/nsatz
-I lib/coq/../coq-core/plugins/number_string_notation
-I lib/coq/../coq-core/plugins/ring
-I lib/coq/../coq-core/plugins/rtauto
-I lib/coq/../coq-core/plugins/ssreflect
-I lib/coq/../coq-core/plugins/ssrmatching
-I lib/coq/../coq-core/plugins/tauto
-I lib/coq/../coq-core/plugins/tutorial/p0
-I lib/coq/../coq-core/plugins/tutorial/p1
-I lib/coq/../coq-core/plugins/tutorial/p2
-I lib/coq/../coq-core/plugins/tutorial/p3
-I lib/coq/../coq-core/plugins/zify
-I .../plugins/btauto
-I .../plugins/cc
-I .../plugins/derive
-I .../plugins/extraction
-I .../plugins/firstorder
-I .../plugins/funind
-I .../plugins/ltac
-I .../plugins/ltac2
-I .../plugins/micromega
-I .../plugins/nsatz
-I .../plugins/number_string_notation
-I .../plugins/ring
-I .../plugins/rtauto
-I .../plugins/ssreflect
-I .../plugins/ssrmatching
-I .../plugins/tauto
-I .../plugins/tutorial/p0
-I .../plugins/tutorial/p1
-I .../plugins/tutorial/p2
-I .../plugins/tutorial/p3
-I .../plugins/zify
-R coq/theories Coq
-R $TESTCASE_ROOT/_build/default minimal
84 changes: 42 additions & 42 deletions test/blackbox-tests/test-cases/coq/coqtop/coqtop-nested.t/run.t
Original file line number Diff line number Diff line change
Expand Up @@ -19,27 +19,27 @@ Checking that we compute the directory and file for dune coq top correctly
-w -deprecated-native-compiler-option
-w -native-compiler-disabled
-native-compiler ondemand
-I lib/coq/../coq-core/plugins/btauto
-I lib/coq/../coq-core/plugins/cc
-I lib/coq/../coq-core/plugins/derive
-I lib/coq/../coq-core/plugins/extraction
-I lib/coq/../coq-core/plugins/firstorder
-I lib/coq/../coq-core/plugins/funind
-I lib/coq/../coq-core/plugins/ltac
-I lib/coq/../coq-core/plugins/ltac2
-I lib/coq/../coq-core/plugins/micromega
-I lib/coq/../coq-core/plugins/nsatz
-I lib/coq/../coq-core/plugins/number_string_notation
-I lib/coq/../coq-core/plugins/ring
-I lib/coq/../coq-core/plugins/rtauto
-I lib/coq/../coq-core/plugins/ssreflect
-I lib/coq/../coq-core/plugins/ssrmatching
-I lib/coq/../coq-core/plugins/tauto
-I lib/coq/../coq-core/plugins/tutorial/p0
-I lib/coq/../coq-core/plugins/tutorial/p1
-I lib/coq/../coq-core/plugins/tutorial/p2
-I lib/coq/../coq-core/plugins/tutorial/p3
-I lib/coq/../coq-core/plugins/zify
-I .../plugins/btauto
-I .../plugins/cc
-I .../plugins/derive
-I .../plugins/extraction
-I .../plugins/firstorder
-I .../plugins/funind
-I .../plugins/ltac
-I .../plugins/ltac2
-I .../plugins/micromega
-I .../plugins/nsatz
-I .../plugins/number_string_notation
-I .../plugins/ring
-I .../plugins/rtauto
-I .../plugins/ssreflect
-I .../plugins/ssrmatching
-I .../plugins/tauto
-I .../plugins/tutorial/p0
-I .../plugins/tutorial/p1
-I .../plugins/tutorial/p2
-I .../plugins/tutorial/p3
-I .../plugins/zify
-R coq/theories Coq
-R $TESTCASE_ROOT/_build/default/theories foo

Expand All @@ -52,27 +52,27 @@ Checking that we compute the directory and file for dune coq top correctly
-w -deprecated-native-compiler-option
-w -native-compiler-disabled
-native-compiler ondemand
-I lib/coq/../coq-core/plugins/btauto
-I lib/coq/../coq-core/plugins/cc
-I lib/coq/../coq-core/plugins/derive
-I lib/coq/../coq-core/plugins/extraction
-I lib/coq/../coq-core/plugins/firstorder
-I lib/coq/../coq-core/plugins/funind
-I lib/coq/../coq-core/plugins/ltac
-I lib/coq/../coq-core/plugins/ltac2
-I lib/coq/../coq-core/plugins/micromega
-I lib/coq/../coq-core/plugins/nsatz
-I lib/coq/../coq-core/plugins/number_string_notation
-I lib/coq/../coq-core/plugins/ring
-I lib/coq/../coq-core/plugins/rtauto
-I lib/coq/../coq-core/plugins/ssreflect
-I lib/coq/../coq-core/plugins/ssrmatching
-I lib/coq/../coq-core/plugins/tauto
-I lib/coq/../coq-core/plugins/tutorial/p0
-I lib/coq/../coq-core/plugins/tutorial/p1
-I lib/coq/../coq-core/plugins/tutorial/p2
-I lib/coq/../coq-core/plugins/tutorial/p3
-I lib/coq/../coq-core/plugins/zify
-I .../plugins/btauto
-I .../plugins/cc
-I .../plugins/derive
-I .../plugins/extraction
-I .../plugins/firstorder
-I .../plugins/funind
-I .../plugins/ltac
-I .../plugins/ltac2
-I .../plugins/micromega
-I .../plugins/nsatz
-I .../plugins/number_string_notation
-I .../plugins/ring
-I .../plugins/rtauto
-I .../plugins/ssreflect
-I .../plugins/ssrmatching
-I .../plugins/tauto
-I .../plugins/tutorial/p0
-I .../plugins/tutorial/p1
-I .../plugins/tutorial/p2
-I .../plugins/tutorial/p3
-I .../plugins/zify
-R coq/theories Coq
-R $TESTCASE_ROOT/_build/default/theories foo

84 changes: 42 additions & 42 deletions test/blackbox-tests/test-cases/coq/coqtop/coqtop-no-build.t
Original file line number Diff line number Diff line change
Expand Up @@ -26,27 +26,27 @@ On a fresh build, this should do nothing but should pass the correct flags:
-nI lib/coq-core/kernel
-nI $TESTCASE_ROOT/_build/default/dir
-boot
-I lib/coq/../coq-core/plugins/btauto
-I lib/coq/../coq-core/plugins/cc
-I lib/coq/../coq-core/plugins/derive
-I lib/coq/../coq-core/plugins/extraction
-I lib/coq/../coq-core/plugins/firstorder
-I lib/coq/../coq-core/plugins/funind
-I lib/coq/../coq-core/plugins/ltac
-I lib/coq/../coq-core/plugins/ltac2
-I lib/coq/../coq-core/plugins/micromega
-I lib/coq/../coq-core/plugins/nsatz
-I lib/coq/../coq-core/plugins/number_string_notation
-I lib/coq/../coq-core/plugins/ring
-I lib/coq/../coq-core/plugins/rtauto
-I lib/coq/../coq-core/plugins/ssreflect
-I lib/coq/../coq-core/plugins/ssrmatching
-I lib/coq/../coq-core/plugins/tauto
-I lib/coq/../coq-core/plugins/tutorial/p0
-I lib/coq/../coq-core/plugins/tutorial/p1
-I lib/coq/../coq-core/plugins/tutorial/p2
-I lib/coq/../coq-core/plugins/tutorial/p3
-I lib/coq/../coq-core/plugins/zify
-I .../plugins/btauto
-I .../plugins/cc
-I .../plugins/derive
-I .../plugins/extraction
-I .../plugins/firstorder
-I .../plugins/funind
-I .../plugins/ltac
-I .../plugins/ltac2
-I .../plugins/micromega
-I .../plugins/nsatz
-I .../plugins/number_string_notation
-I .../plugins/ring
-I .../plugins/rtauto
-I .../plugins/ssreflect
-I .../plugins/ssrmatching
-I .../plugins/tauto
-I .../plugins/tutorial/p0
-I .../plugins/tutorial/p1
-I .../plugins/tutorial/p2
-I .../plugins/tutorial/p3
-I .../plugins/zify
-R coq/theories Coq
-R $TESTCASE_ROOT/_build/default/dir basic

Expand All @@ -61,26 +61,26 @@ And for comparison normally a build would happen:
-nI lib/coq-core/kernel
-nI $TESTCASE_ROOT/_build/default/dir
-boot
-I lib/coq/../coq-core/plugins/btauto
-I lib/coq/../coq-core/plugins/cc
-I lib/coq/../coq-core/plugins/derive
-I lib/coq/../coq-core/plugins/extraction
-I lib/coq/../coq-core/plugins/firstorder
-I lib/coq/../coq-core/plugins/funind
-I lib/coq/../coq-core/plugins/ltac
-I lib/coq/../coq-core/plugins/ltac2
-I lib/coq/../coq-core/plugins/micromega
-I lib/coq/../coq-core/plugins/nsatz
-I lib/coq/../coq-core/plugins/number_string_notation
-I lib/coq/../coq-core/plugins/ring
-I lib/coq/../coq-core/plugins/rtauto
-I lib/coq/../coq-core/plugins/ssreflect
-I lib/coq/../coq-core/plugins/ssrmatching
-I lib/coq/../coq-core/plugins/tauto
-I lib/coq/../coq-core/plugins/tutorial/p0
-I lib/coq/../coq-core/plugins/tutorial/p1
-I lib/coq/../coq-core/plugins/tutorial/p2
-I lib/coq/../coq-core/plugins/tutorial/p3
-I lib/coq/../coq-core/plugins/zify
-I .../plugins/btauto
-I .../plugins/cc
-I .../plugins/derive
-I .../plugins/extraction
-I .../plugins/firstorder
-I .../plugins/funind
-I .../plugins/ltac
-I .../plugins/ltac2
-I .../plugins/micromega
-I .../plugins/nsatz
-I .../plugins/number_string_notation
-I .../plugins/ring
-I .../plugins/rtauto
-I .../plugins/ssreflect
-I .../plugins/ssrmatching
-I .../plugins/tauto
-I .../plugins/tutorial/p0
-I .../plugins/tutorial/p1
-I .../plugins/tutorial/p2
-I .../plugins/tutorial/p3
-I .../plugins/zify
-R coq/theories Coq
-R $TESTCASE_ROOT/_build/default/dir basic
Loading
Loading