Skip to content

Commit

Permalink
s/_TARGET/_HOST for the RO test
Browse files Browse the repository at this point in the history
  • Loading branch information
@dra27
dra27 committed Oct 31, 2023
1 parent 2059955 commit 4e323f7
Show file tree
Hide file tree
Showing 2 changed files with 40 additions and 40 deletions.
40 changes: 20 additions & 20 deletions tests/reftests/env.unix.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -586,40 +586,40 @@ RF_ENVSET_WITH_COL = s:mething norewrite Updated\ by\ package\ false
RF_ENVSET_ADD += /a/given/path norewrite Updated\ by\ package\ false
RF_ENVSET_ADD_WITH_COL += a:/nother/gi;ven/path norewrite Updated\ by\ package\ false
### : Complete :
### RO_ENVSET_COL_TARGET=a/path/to
### RO_ENVSET_COL_TARGET_QUOTED=a/path/to:"this/i:s/quoted"
### RO_ENVBUILD_COL_TARGET=a/path/to
### RO_ENVBUILD_COL_TARGET_QUOTED=a/path/to:"this/i:s/quoted"
### RO_ENVSET_COL_HOST=a/path/to
### RO_ENVSET_COL_HOST_QUOTED=a/path/to:"this/i:s/quoted"
### RO_ENVBUILD_COL_HOST=a/path/to
### RO_ENVBUILD_COL_HOST_QUOTED=a/path/to:"this/i:s/quoted"
### <pkg:rewrite.1>
opam-version: "2.0"
setenv: [
[ RO_ENVSET = "/a/given/path" ]
[ RO_ENVSET_STR = "something" ]
[ RO_ENVSET_STR_WS = "something/else" ]
[ RO_ENVSET_COL = "s:mething" ]
[ RO_ENVSET_COL_TARGET += "a:/nother/gi;ven/path" ]
[ RO_ENVSET_COL_TARGET_QUOTED += "a:/nother/gi;ven/path" ]
[ RO_ENVSET_COL_HOST += "a:/nother/gi;ven/path" ]
[ RO_ENVSET_COL_HOST_QUOTED += "a:/nother/gi;ven/path" ]
]
build-env: [
[ RO_ENVBUILD = "/another/given/path" ]
[ RO_ENVBUILD_STR = "something" ]
[ RO_ENVBUILD_COL = "s:mething" ]
[ RO_ENVBUILD_COL_TARGET += "a:/nother/gi;ven/path" ]
[ RO_ENVBUILD_COL_TARGET_QUOTED += "a:/nother/gi;ven/path" ]
[ RO_ENVBUILD_COL_HOST += "a:/nother/gi;ven/path" ]
[ RO_ENVBUILD_COL_HOST_QUOTED += "a:/nother/gi;ven/path" ]
]
build: [ "sh" "-c" "env | grep RO_ENV" ]
x-env-path-rewrite: [
[ RO_ENVSET ":" "target" ]
[ RO_ENVSET_STR_WS false ]
[ RO_ENVSET_COL ":" "target-quoted" ]
[ RO_ENVSET_COL_TARGET ";" "host" ]
[ RO_ENVSET_COL_TARGET_QUOTED ":" "host-quoted" ]
[ RO_ENVSET_COL_HOST ";" "host" ]
[ RO_ENVSET_COL_HOST_QUOTED ":" "host-quoted" ]

[ RO_ENVBUILD ":" "target" ]
[ RO_ENVBUILD_STR_WS false ]
[ RO_ENVBUILD_COL ":" "target" ]
[ RO_ENVBUILD_COL_TARGET ";" "host" ]
[ RO_ENVBUILD_COL_TARGET_QUOTED ":" "host-quoted" ]
[ RO_ENVBUILD_COL_HOST ";" "host" ]
[ RO_ENVBUILD_COL_HOST_QUOTED ":" "host-quoted" ]
]
### cat OPAM/rewriting/.opam-switch/environment | grep RO_ENV
### opam install rewrite -v | sed-cmd sh | unordered
Expand All @@ -632,11 +632,11 @@ Processing 2/3: [rewrite: sh env | grep RO_ENV]
+ sh "-c" "env | grep RO_ENV" (CWD=${BASEDIR}/OPAM/rewriting/.opam-switch/build/rewrite.1)
- RO_ENVBUILD=/another/given/path
- RO_ENVBUILD_COL=s:mething
- RO_ENVBUILD_COL_TARGET=a:/nother/gi;ven/path;a/path/to
- RO_ENVBUILD_COL_TARGET_QUOTED="a:/nother/gi;ven/path":a/path/to:"this/i:s/quoted"
- RO_ENVBUILD_COL_HOST=a:/nother/gi;ven/path;a/path/to
- RO_ENVBUILD_COL_HOST_QUOTED="a:/nother/gi;ven/path":a/path/to:"this/i:s/quoted"
- RO_ENVBUILD_STR=something
- RO_ENVSET_COL_TARGET=a/path/to
- RO_ENVSET_COL_TARGET_QUOTED=a/path/to:"this/i:s/quoted"
- RO_ENVSET_COL_HOST=a/path/to
- RO_ENVSET_COL_HOST_QUOTED=a/path/to:"this/i:s/quoted"
-> compiled rewrite.1
-> installed rewrite.1
Done.
Expand All @@ -645,15 +645,15 @@ RO_ENVSET='/a/given/path'; export RO_ENVSET;
RO_ENVSET_STR='something'; export RO_ENVSET_STR;
RO_ENVSET_STR_WS='something/else'; export RO_ENVSET_STR_WS;
RO_ENVSET_COL='"s:mething"'; export RO_ENVSET_COL;
RO_ENVSET_COL_TARGET='a:/nother/gi;ven/path;a/path/to'; export RO_ENVSET_COL_TARGET;
RO_ENVSET_COL_TARGET_QUOTED='"a:/nother/gi;ven/path":a/path/to:"this/i:s/quoted"'; export RO_ENVSET_COL_TARGET_QUOTED;
RO_ENVSET_COL_HOST='a:/nother/gi;ven/path;a/path/to'; export RO_ENVSET_COL_HOST;
RO_ENVSET_COL_HOST_QUOTED='"a:/nother/gi;ven/path":a/path/to:"this/i:s/quoted"'; export RO_ENVSET_COL_HOST_QUOTED;
### cat OPAM/rewriting/.opam-switch/environment | grep RO_ENV
RO_ENVSET = /a/given/path : target Updated\ by\ package\ rewrite
RO_ENVSET_STR = something : target Updated\ by\ package\ rewrite
RO_ENVSET_STR_WS = something/else norewrite Updated\ by\ package\ rewrite
RO_ENVSET_COL = s:mething : target-quoted Updated\ by\ package\ rewrite
RO_ENVSET_COL_TARGET += a:/nother/gi;ven/path ; host Updated\ by\ package\ rewrite
RO_ENVSET_COL_TARGET_QUOTED += a:/nother/gi;ven/path : host-quoted Updated\ by\ package\ rewrite
RO_ENVSET_COL_HOST += a:/nother/gi;ven/path ; host Updated\ by\ package\ rewrite
RO_ENVSET_COL_HOST_QUOTED += a:/nother/gi;ven/path : host-quoted Updated\ by\ package\ rewrite
### : All formluaes :
### <pkg:all-formulae.1>
opam-version: "2.0"
Expand Down
40 changes: 20 additions & 20 deletions tests/reftests/env.win32.test
View file
Original file line number Diff line number Diff line change
Expand Up @@ -616,10 +616,10 @@ RF_ENVSET_WITH_COL = s:mething norewrite Updated\ by\ package\ false
RF_ENVSET_ADD += /a/given/path norewrite Updated\ by\ package\ false
RF_ENVSET_ADD_WITH_COL += a:/nother/gi;ven/path norewrite Updated\ by\ package\ false
### : Complete :
### RO_ENVSET_COL_TARGET=a/path/to
### RO_ENVSET_COL_TARGET_QUOTED=a/path/to:"this/i:s/quoted"
### RO_ENVBUILD_COL_TARGET=a/path/to
### RO_ENVBUILD_COL_TARGET_QUOTED=a/path/to:"this/i:s/quoted"
### RO_ENVSET_COL_HOST=a/path/to
### RO_ENVSET_COL_HOST_QUOTED=a/path/to:"this/i:s/quoted"
### RO_ENVBUILD_COL_HOST=a/path/to
### RO_ENVBUILD_COL_HOST_QUOTED=a/path/to:"this/i:s/quoted"
### <pkg:rewrite.1>
opam-version: "2.0"
setenv: [
Expand All @@ -628,30 +628,30 @@ setenv: [
[ RO_ENVSET_STR_WS = "something/else" ]
[ RO_ENVSET_STR_WS2 = "something/else" ]
[ RO_ENVSET_COL = "s:mething" ]
[ RO_ENVSET_COL_TARGET += "a:/nother/gi;ven/path" ]
[ RO_ENVSET_COL_TARGET_QUOTED += "a:/nother/gi;ven/path" ]
[ RO_ENVSET_COL_HOST += "a:/nother/gi;ven/path" ]
[ RO_ENVSET_COL_HOST_QUOTED += "a:/nother/gi;ven/path" ]
]
build-env: [
[ RO_ENVBUILD = "/another/given/path" ]
[ RO_ENVBUILD_STR = "something" ]
[ RO_ENVBUILD_COL = "s:mething" ]
[ RO_ENVBUILD_COL_TARGET += "a:/nother/gi;ven/path" ]
[ RO_ENVBUILD_COL_TARGET_QUOTED += "a:/nother/gi;ven/path" ]
[ RO_ENVBUILD_COL_HOST += "a:/nother/gi;ven/path" ]
[ RO_ENVBUILD_COL_HOST_QUOTED += "a:/nother/gi;ven/path" ]
]
build: [ "sh" "-c" "env | grep RO_ENV" ]
x-env-path-rewrite: [
[ RO_ENVSET ":" "target" ]
[ RO_ENVSET_STR_WS false ]
[ RO_ENVSET_STR_WS2 true ]
[ RO_ENVSET_COL ":" "target-quoted" ]
[ RO_ENVSET_COL_TARGET ";" "host" ]
[ RO_ENVSET_COL_TARGET_QUOTED ":" "host-quoted" ]
[ RO_ENVSET_COL_HOST ";" "host" ]
[ RO_ENVSET_COL_HOST_QUOTED ":" "host-quoted" ]

[ RO_ENVBUILD ":" "target" ]
[ RO_ENVBUILD_STR_WS false ]
[ RO_ENVBUILD_COL ":" "target" ]
[ RO_ENVBUILD_COL_TARGET ";" "host" ]
[ RO_ENVBUILD_COL_TARGET_QUOTED ":" "host-quoted" ]
[ RO_ENVBUILD_COL_HOST ";" "host" ]
[ RO_ENVBUILD_COL_HOST_QUOTED ":" "host-quoted" ]
]
### cat OPAM/rewriting/.opam-switch/environment | grep RO_ENV
### opam install rewrite -v | sed-cmd sh | unordered
Expand All @@ -664,11 +664,11 @@ Processing 2/3: [rewrite: sh env | grep RO_ENV]
+ sh "-c" "env | grep RO_ENV" (CWD=${BASEDIR}/OPAM/rewriting/.opam-switch/build/rewrite.1)
- RO_ENVBUILD=/another/given/path
- RO_ENVBUILD_COL=s:mething
- RO_ENVBUILD_COL_TARGET=/cygdrive/a/nother/gi;ven/path;a/path/to
- RO_ENVBUILD_COL_TARGET_QUOTED=/cygdrive/a/nother/gi;ven/path:a/path/to:"this/i:s/quoted"
- RO_ENVBUILD_COL_HOST=/cygdrive/a/nother/gi;ven/path;a/path/to
- RO_ENVBUILD_COL_HOST_QUOTED=/cygdrive/a/nother/gi;ven/path:a/path/to:"this/i:s/quoted"
- RO_ENVBUILD_STR=something
- RO_ENVSET_COL_TARGET=a/path/to
- RO_ENVSET_COL_TARGET_QUOTED=a/path/to:"this/i:s/quoted"
- RO_ENVSET_COL_HOST=a/path/to
- RO_ENVSET_COL_HOST_QUOTED=a/path/to:"this/i:s/quoted"
-> compiled rewrite.1
-> installed rewrite.1
Done.
Expand All @@ -678,16 +678,16 @@ RO_ENVSET_STR='something'; export RO_ENVSET_STR;
RO_ENVSET_STR_WS='something/else'; export RO_ENVSET_STR_WS;
RO_ENVSET_STR_WS2='something/else'; export RO_ENVSET_STR_WS2;
RO_ENVSET_COL='"s:mething"'; export RO_ENVSET_COL;
RO_ENVSET_COL_TARGET='/cygdrive/a/nother/gi;ven/path;a/path/to'; export RO_ENVSET_COL_TARGET;
RO_ENVSET_COL_TARGET_QUOTED='/cygdrive/a/nother/gi;ven/path:a/path/to:"this/i:s/quoted"'; export RO_ENVSET_COL_TARGET_QUOTED;
RO_ENVSET_COL_HOST='/cygdrive/a/nother/gi;ven/path;a/path/to'; export RO_ENVSET_COL_HOST;
RO_ENVSET_COL_HOST_QUOTED='/cygdrive/a/nother/gi;ven/path:a/path/to:"this/i:s/quoted"'; export RO_ENVSET_COL_HOST_QUOTED;
### cat OPAM/rewriting/.opam-switch/environment | grep RO_ENV
RO_ENVSET = /a/given/path : target Updated\ by\ package\ rewrite
RO_ENVSET_STR = something ; target Updated\ by\ package\ rewrite
RO_ENVSET_STR_WS = something/else norewrite Updated\ by\ package\ rewrite
RO_ENVSET_STR_WS2 = something/else ; target Updated\ by\ package\ rewrite
RO_ENVSET_COL = s:mething : target-quoted Updated\ by\ package\ rewrite
RO_ENVSET_COL_TARGET += a:/nother/gi;ven/path ; host Updated\ by\ package\ rewrite
RO_ENVSET_COL_TARGET_QUOTED += a:/nother/gi;ven/path : host-quoted Updated\ by\ package\ rewrite
RO_ENVSET_COL_HOST += a:/nother/gi;ven/path ; host Updated\ by\ package\ rewrite
RO_ENVSET_COL_HOST_QUOTED += a:/nother/gi;ven/path : host-quoted Updated\ by\ package\ rewrite
### : All formluae :
### <pkg:all-formulae.1>
opam-version: "2.0"
Expand Down

0 comments on commit 4e323f7

Please sign in to comment.