Skip to content

Commit ce43c84

Browse files
authored
Merge pull request #7026 from rjbou/reftest-dot-install
reftests: run dot install non exe fields test without strict mode
2 parents ec4489f + a72b604 commit ce43c84

2 files changed

Lines changed: 59 additions & 19 deletions

File tree

master_changes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -202,7 +202,7 @@ users)
202202
* Add in `repository` test cases for switching automatically from directory to archive format & vice versa [#6625 @rjbou]
203203
* Add in `repository` test cases for upgrade opam root from 2.5 with repo tarring or 2.1 to 2.6, with `OPAMREPOSITORYTARRING` enabled (trigger upgrade) [#6625 @rjbou]
204204
* Add 2.6 root test cases in opamroot-versions [#6625 @rjbou]
205-
* Add tests for `.install` fields handling [#6956 @rjbou]
205+
* Add tests for `.install` fields handling [#6956 #67026 @rjbou]
206206

207207
### Engine
208208
* Add `http-server` to launch a minimal http server [#6939 @rjbou]

tests/reftests/dot-install-non-exe-fields.test

Lines changed: 58 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ N0REP0
1818
### : * man: it needs a specific file format
1919
### :::::::
2020
### OPAMYES=1
21+
### # we need to disable strict bc of erroring warnings
22+
### OPAMSTRICT=0
2123
### # we neeed the precise tracking to have a sha in changes file instead of timestamp
2224
### OPAMPRECISETRACKING=1
2325
### OPAMDEBUGSECTIONS="TRACK ACTION"
@@ -1555,6 +1557,14 @@ Some files in ${BASEDIR}/OPAM/sw-man/.opam-switch/install/pkg-man.install couldn
15551557
# OPAM/sw-man/.opam-switch/install/pkg-man.changes not found
15561558
### ocaml cat.ml sw-man pkg-man
15571559
==> No 'installed-file' found
1560+
### OPAMDEBUG=-5 opam remove pkg-man
1561+
[NOTE] pkg-man is not installed.
1562+
1563+
Nothing to do.
1564+
### opam-cat OPAM/sw-man/.opam-switch/install/pkg-man.changes
1565+
# OPAM/sw-man/.opam-switch/install/pkg-man.changes not found
1566+
### ocaml cat.ml sw-man pkg-man
1567+
==> No 'installed-file' found
15581568
### :VIII:5: Wrongly-formed filename, no destination specified
15591569
### # ERROR: this error should be better handled
15601570
### <pkg:pkg-man.1>
@@ -1573,18 +1583,33 @@ FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
15731583
ACTION download_package: pkg-man.1
15741584
ACTION prepare_package_source: pkg-man.1 at ${BASEDIR}/OPAM/sw-man/.opam-switch/build/pkg-man.1
15751585
[ERROR] In ${BASEDIR}/OPAM/sw-man/.opam-switch/build/pkg-man.1/pkg-man.install:
1576-
Not_found
1577-
[ERROR] Strict mode: aborting
1586+
Not_found [skipped]
15781587

1579-
OpamStd.OpamSys.Exit(30)
1588+
TRACK before install: 0 elements scanned in 0.000s
1589+
ACTION Installing pkg-man.1.
15801590

1591+
TRACK after install: 0 elements, 0 added, scanned in 0.000s
1592+
ACTION changes recorded for pkg-man.1: 0 items
1593+
-> installed pkg-man.1
1594+
Done.
1595+
### opam-cat OPAM/sw-man/.opam-switch/install/pkg-man.changes
1596+
opam-version: "2.0"
1597+
### ocaml cat.ml sw-man pkg-man
1598+
==> No 'installed-file' found
1599+
### OPAMDEBUG=-5 opam remove pkg-man
1600+
The following actions will be performed:
1601+
=== remove 1 package
1602+
- remove pkg-man 1
15811603

1582-
<><> Error report <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
1583-
+- The following actions failed
1584-
| - install pkg-man 1
1585-
+-
1586-
- No changes have been performed
1587-
# Return code 31 #
1604+
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
1605+
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
1606+
ACTION Removing pkg-man.1
1607+
ACTION Removing files from .install
1608+
ACTION Removing the misc files
1609+
-> removed pkg-man.1
1610+
ACTION Cleaning up artefacts of pkg-man.1
1611+
ACTION Removing the local metadata
1612+
Done.
15881613
### opam-cat OPAM/sw-man/.opam-switch/install/pkg-man.changes
15891614
# OPAM/sw-man/.opam-switch/install/pkg-man.changes not found
15901615
### ocaml cat.ml sw-man pkg-man
@@ -1607,18 +1632,33 @@ FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
16071632
ACTION download_package: pkg-man.1
16081633
ACTION prepare_package_source: pkg-man.1 at ${BASEDIR}/OPAM/sw-man/.opam-switch/build/pkg-man.1
16091634
[ERROR] In ${BASEDIR}/OPAM/sw-man/.opam-switch/build/pkg-man.1/pkg-man.install:
1610-
Not_found
1611-
[ERROR] Strict mode: aborting
1635+
Not_found [skipped]
16121636

1613-
OpamStd.OpamSys.Exit(30)
1637+
TRACK before install: 0 elements scanned in 0.000s
1638+
ACTION Installing pkg-man.1.
16141639

1640+
TRACK after install: 0 elements, 0 added, scanned in 0.000s
1641+
ACTION changes recorded for pkg-man.1: 0 items
1642+
-> installed pkg-man.1
1643+
Done.
1644+
### opam-cat OPAM/sw-man/.opam-switch/install/pkg-man.changes
1645+
opam-version: "2.0"
1646+
### ocaml cat.ml sw-man pkg-man
1647+
==> No 'installed-file' found
1648+
### OPAMDEBUG=-5 opam remove pkg-man
1649+
The following actions will be performed:
1650+
=== remove 1 package
1651+
- remove pkg-man 1
16151652

1616-
<><> Error report <><><><><><><><><><><><><><><><><><><><><><><><><><><><><><><>
1617-
+- The following actions failed
1618-
| - install pkg-man 1
1619-
+-
1620-
- No changes have been performed
1621-
# Return code 31 #
1653+
<><> Processing actions <><><><><><><><><><><><><><><><><><><><><><><><><><><><>
1654+
FILE(config) Read ${BASEDIR}/OPAM/config in 0.000s
1655+
ACTION Removing pkg-man.1
1656+
ACTION Removing files from .install
1657+
ACTION Removing the misc files
1658+
-> removed pkg-man.1
1659+
ACTION Cleaning up artefacts of pkg-man.1
1660+
ACTION Removing the local metadata
1661+
Done.
16221662
### opam-cat OPAM/sw-man/.opam-switch/install/pkg-man.changes
16231663
# OPAM/sw-man/.opam-switch/install/pkg-man.changes not found
16241664
### ocaml cat.ml sw-man pkg-man

0 commit comments

Comments
 (0)