From f50596cb2092ce5291fae3e6afa2e0b9f42367e3 Mon Sep 17 00:00:00 2001 From: Raja Boujbel Date: Thu, 24 Aug 2023 17:53:45 +0200 Subject: [PATCH] reftests: add test for operators in opamfile filters --- master_changes.md | 3 + tests/reftests/dune.inc | 18 ++ tests/reftests/filter-operators.test | 327 +++++++++++++++++++++++++++ 3 files changed, 348 insertions(+) create mode 100644 tests/reftests/filter-operators.test diff --git a/master_changes.md b/master_changes.md index 1ab70ae3e4a..121db1fd3a4 100644 --- a/master_changes.md +++ b/master_changes.md @@ -98,6 +98,9 @@ users) ## Reftests ### Tests + * Add some additional test to tree, for `--dev` && `--no-switch` [#5687 @rjbou] + * switch-set: add test that checks unsetting `OPAMSWITCH` when it was set by `opam env --set-switch` on an already set `OPAMSWITCH` variable in environment [#5742 rjbou] + * Add test for filter operators in opam file [#5642 @rjbou] ### Engine diff --git a/tests/reftests/dune.inc b/tests/reftests/dune.inc index e9190d12e7d..361e457284d 100644 --- a/tests/reftests/dune.inc +++ b/tests/reftests/dune.inc @@ -620,6 +620,24 @@ %{targets} (run ./run.exe %{exe:../../src/client/opamMain.exe.exe} %{dep:extrasource.test} %{read-lines:testing-env})))) +(rule + (alias reftest-filter-operators) + (action + (diff filter-operators.test filter-operators.out))) + +(alias + (name reftest) + (deps (alias reftest-filter-operators))) + +(rule + (targets filter-operators.out) + (deps root-N0REP0) + (package opam) + (action + (with-stdout-to + %{targets} + (run ./run.exe %{exe:../../src/client/opamMain.exe.exe} %{dep:filter-operators.test} %{read-lines:testing-env})))) + (rule (alias reftest-init-ocaml-eval-variables.unix) (enabled_if (= %{os_type} "Unix")) diff --git a/tests/reftests/filter-operators.test b/tests/reftests/filter-operators.test new file mode 100644 index 00000000000..eb8af56e85b --- /dev/null +++ b/tests/reftests/filter-operators.test @@ -0,0 +1,327 @@ +N0REP0 +### : Test filter operators : +### OPAMSTRICT=0 +### +opam-version: "2.0" +### +opam-version: "2.0" +### +opam-version: "2.0" +### +opam-version: "2.0" +### +opam-version: "2.0" +### +opam-version: "2.0" +### +opam-version: "2.0" +### +opam-version: "2.0" +### +opam-version: "2.0" +### opam switch create operators --empty +### OPAMSHOW=1 +### :: undefined :: +### +opam-version: "2.0" +depends: [ + "ok" + "a" { ?defin } +] +### opam install undefined +The following actions would be performed: +=== install 2 packages + - install ok 1 [required by undefined] + - install undefined 1 +### OPAMVAR_defin=something opam install undefined +The following actions would be performed: +=== install 3 packages + - install a 1 [required by undefined] + - install ok 1 [required by undefined] + - install undefined 1 +### +opam-version: "2.0" +depends: [ + "ok" + "a" { ?(defined & undefined) } +] +### OPAMVAR_defined=something opam install undefined +The following actions would be performed: +=== install 2 packages + - install ok 1 [required by undefined] + - install undefined 1 +### OPAMVAR_defined=something OPAMVAR_undefined=defined opam install undefined +The following actions would be performed: +=== install 2 packages + - install ok 1 [required by undefined] + - install undefined 1 +### +opam-version: "2.0" +depends: [ + "ok" + "a" { undefined | true } + "b" { undefined & false } +] +### opam install undefined +The following actions would be performed: +=== install 3 packages + - install a 1 [required by undefined] + - install ok 1 [required by undefined] + - install undefined 1 +### :: not :: +### +opam-version: "2.0" +depends: [ "ok" "a" { !bvar } ] +### OPAMVAR_bvar=true opam install not +The following actions would be performed: +=== install 2 packages + - install not 1 + - install ok 1 [required by not] +### OPAMVAR_bvar=false opam install not +The following actions would be performed: +=== install 3 packages + - install a 1 [required by not] + - install not 1 + - install ok 1 [required by not] +### :: and :: +### +opam-version: "2.0" +depends: [ + "ok" + "a" { true & true } + "ko" { true & false } + "error" { false & false } +] +### opam install and +The following actions would be performed: +=== install 3 packages + - install a 1 [required by and] + - install and 1 + - install ok 1 [required by and] +### :: or :: +### +opam-version: "2.0" +depends: [ + "ok" + "a" { true | true } + "b" { true | false } + "ko" { false | false } +] +### opam install or +The following actions would be performed: +=== install 4 packages + - install a 1 [required by or] + - install b 1 [required by or] + - install ok 1 [required by or] + - install or 1 +### :: eq :: +### +opam-version: "2.0" +depends: [ + "ok" + "a" { 2=2 } + "ko-int" { 2=3 } + "b" { "a" = "a" } + "ko-string" { "a" = "b" } + "c" { true = true } + "ko-bool" { true = false } +] +### opam install eq +The following actions would be performed: +=== install 5 packages + - install a 1 [required by eq] + - install b 1 [required by eq] + - install c 1 [required by eq] + - install eq 1 + - install ok 1 [required by eq] +### :: neq :: +### +opam-version: "2.0" +depends: [ + "ok" + "a" { 2!=3 } + "ko-int" { 2!=2 } + "b" { "a" != "b" } + "ko-string" { "b" != "b" } + "c" { true != false } + "ko-bool" { true != true } +] +### opam install neq +The following actions would be performed: +=== install 5 packages + - install a 1 [required by neq] + - install b 1 [required by neq] + - install c 1 [required by neq] + - install neq 1 + - install ok 1 [required by neq] +### :: lt :: +### +opam-version: "2.0" +depends: [ + "ok" + "a" { 2<3 } + "ko-int" { 3<2 } + "b" { "a" < "b" } + "ko-string" { "b" < "a" } + "c" { false < true } + "ko-bool" { true < false } +] +### opam install lt +The following actions would be performed: +=== install 5 packages + - install a 1 [required by lt] + - install b 1 [required by lt] + - install c 1 [required by lt] + - install lt 1 + - install ok 1 [required by lt] +### :: lteq :: +### +opam-version: "2.0" +depends: [ + "ok" + "a" { 2<=3 & 2<=2 } + "ko-int" { 3<=2 } + "b" { "a" <= "b" & "a" <= "a" } + "ko-string" { "b" <= "a" } + "c" { false <= true & false <= false } + "ko-bool" { true <= false } +] +### opam install lteq +The following actions would be performed: +=== install 5 packages + - install a 1 [required by lteq] + - install b 1 [required by lteq] + - install c 1 [required by lteq] + - install lteq 1 + - install ok 1 [required by lteq] +### :: gt :: +### +opam-version: "2.0" +depends: [ + "ok" + "a" { 4>3 } + "ko-int" { 3>4 } + "b" { "d" > "b" } + "ko-string" { "b" > "d" } + "c" { true > false } + "ko-bool" { false > true } +] +### opam install gt +The following actions would be performed: +=== install 5 packages + - install a 1 [required by gt] + - install b 1 [required by gt] + - install c 1 [required by gt] + - install gt 1 + - install ok 1 [required by gt] +### :: gteq :: +### +opam-version: "2.0" +depends: [ + "ok" + "a" { 4>=3 & 4>=4 } + "ko-int" { 3>=4 } + "b" { "d" >= "b" & "d" >= "d" } + "ko-string" { "b" >= "d" } + "c" { true >= false & true >= true } + "ko-bool" { false >= true } +] +### opam install gteq +The following actions would be performed: +=== install 5 packages + - install a 1 [required by gteq] + - install b 1 [required by gteq] + - install c 1 [required by gteq] + - install gteq 1 + - install ok 1 [required by gteq] +### :: Combination :: +### +opam-version: "2.0" +depends: [ + "ok" + "a" { false & false | true } + "ko" { false & (false | true) } +] +### opam install comb +The following actions would be performed: +=== install 3 packages + - install a 1 [required by comb] + - install comb 1 + - install ok 1 [required by comb] +### :: Package combination :: +### +opam-version:"2.0" +messages: [ + "this is a package" + "with all defined variables" { a+b:var } +] +### OPAMVAR_a_var=true OPAMVAR_b_var=false opam install pkg-comb +The following actions would be performed: +=== install 1 package + - install pkg-comb 1 this is a package +### OPAMVAR_a_var=false OPAMVAR_b_var=false opam install pkg-comb +The following actions would be performed: +=== install 1 package + - install pkg-comb 1 this is a package +### OPAMVAR_a_var=true OPAMVAR_b_var=true opam install pkg-comb +The following actions would be performed: +=== install 1 package + - install pkg-comb 1 this is a package + with all defined variables +### +opam-version:"2.0" +post-messages: [ + "packages a & b are %{a+b:enable}%" +] +### OPAMSHOW=0 +### opam install pkg-comb-enable +The following actions will be performed: +=== install 1 package + - install pkg-comb-enable 1 + +<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><> +-> installed pkg-comb-enable.1 +Done. + +<><> pkg-comb-enable.1 installed successfully <><><><><><><><><><><><><><><><><> +=> packages a & b are disable +### opam install a +The following actions will be performed: +=== install 1 package + - install a 1 + +<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><> +-> installed a.1 +Done. +### opam reinstall pkg-comb-enable +The following actions will be performed: +=== recompile 1 package + - recompile pkg-comb-enable 1 + +<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><> +-> removed pkg-comb-enable.1 +-> installed pkg-comb-enable.1 +Done. + +<><> pkg-comb-enable.1 installed successfully <><><><><><><><><><><><><><><><><> +=> packages a & b are disable +### opam install b +The following actions will be performed: +=== install 1 package + - install b 1 + +<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><> +-> installed b.1 +Done. +### opam reinstall pkg-comb-enable +The following actions will be performed: +=== recompile 1 package + - recompile pkg-comb-enable 1 + +<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><> +-> removed pkg-comb-enable.1 +-> installed pkg-comb-enable.1 +Done. + +<><> pkg-comb-enable.1 installed successfully <><><><><><><><><><><><><><><><><> +=> packages a & b are enable