File tree Expand file tree Collapse file tree 4 files changed +24
-45
lines changed
test/blackbox-tests/test-cases/oxcaml Expand file tree Collapse file tree 4 files changed +24
-45
lines changed Load Diff This file was deleted.
Original file line number Diff line number Diff line change @@ -369,3 +369,22 @@ jobs:
369369 restore-prefixes-first-match : nix-${{ runner.os }}-${{ github.job }}-
370370 gc-max-store-size-linux : 5G
371371 - run : nix develop .#microbench -c make dune build bench/micro
372+
373+ oxcaml-test :
374+ name : OxCaml
375+ needs : nix-build
376+ runs-on : ubuntu-latest
377+ steps :
378+ - uses : actions/checkout@v5
379+ - uses : nixbuild/nix-quick-install-action@v34
380+ with :
381+ nix_conf : ${{ env.EXTRA_NIX_CONFIG }}
382+ - uses : nix-community/cache-nix-action@v6
383+ with :
384+ primary-key : |
385+ nix-${{ runner.os }}-${{ github.job }}-${{ hashFiles('**/*.nix', '**/flake.lock') }}
386+ restore-prefixes-first-match : nix-${{ runner.os }}-${{ github.job }}-
387+ gc-max-store-size-linux : 2G
388+ - run : |
389+ nix develop .#ox-minimal -c ocaml --version
390+ nix develop .#ox-minimal -c make test-ox
Original file line number Diff line number Diff line change @@ -112,6 +112,9 @@ test-all: $(BIN)
112112test-all-sans-melange : $(BIN )
113113 $(BIN ) build @runtest @runtest-js @runtest-coq
114114
115+ test-ox : $(BIN )
116+ $(BIN ) runtest test/blackbox-tests/test-cases/oxcaml
117+
115118.PHONY : check
116119check : $(BIN )
117120 @$(BIN ) build @check
Original file line number Diff line number Diff line change @@ -383,10 +383,8 @@ A library can have more parameters than its dependencies:
383383 > (library (name lib2) (parameters a b c) (libraries lib ))
384384 > EOF
385385
386- $ ocamlc_where= " $(ocamlc -where)"
387- $ export BUILD_PATH_PREFIX_MAP= " /OCAMLC_WHERE=$ ocamlc_where :$ BUILD_PATH_PREFIX_MAP"
388- $ melc_compiler= " $(which melc)" &> / dev/ null
389- $ export BUILD_PATH_PREFIX_MAP= " /MELC_COMPILER=$ melc_compiler :$ BUILD_PATH_PREFIX_MAP"
386+ We expect to see the parameter flag in the merlin config:
387+
390388 $ dune build
391389 $ dune ocaml dump-dot-merlin lib2 | grep ' parameter'
392390 # FLG -parameter A -parameter B -parameter C
You can’t perform that action at this time.
0 commit comments