Mirrors/miller
1
0
Fork 0
mirror of https://github.com/johnkerl/miller.git synced 2026-07-17 16:38:54 +00:00
Code Issues Projects Releases Wiki Activity

Avoid assuming ./mlr is the mlr to test (#876)

Browse source 
In test cases, support a ${MLR} placeholder for the mlr binary under
test, instead of assuming it's ./mlr (or its equivalent on platforms
not using forward slashes).

This ensures that wrapped mlr invocations all use the same binary,
either the default or the binary specified by the user, avoiding
surprises when ./mlr doesn't exist or is a different version.

Signed-off-by: Stephen Kitt <steve@sk2.org>
This commit is contained in:
Stephen Kitt 2022-01-17 23:01:40 +01:00 • committed by GitHub
parent 7ad53b0ce1
commit af7bacf00e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
internal/pkg/auxents/regtest/regtester.go
View file

@ -773,6 +773,7 @@ func (regtester *RegTester) loadFile(
contents := string(byteContents)
contents = strings.ReplaceAll(contents, "${CASEDIR}", caseDir)
contents = strings.ReplaceAll(contents, "${PATHSEP}", string(os.PathSeparator))
contents = strings.ReplaceAll(contents, "${MLR}", regtester.exeName)
return contents, nil
}

2
test/cases-not-suitable-for-ci/verb-join-prepipe/0001/cmd
View file

@ -1 +1 @@
mlr --prepipe '.${PATHSEP}mlr cat' --odkvp join -j a -f test/input/join-het.dkvp test/input/abixy-het
mlr --prepipe '${MLR} cat' --odkvp join -j a -f test/input/join-het.dkvp test/input/abixy-het

2
test/cases-not-suitable-for-ci/verb-join-prepipe/0002/cmd
View file

@ -1 +1 @@
mlr --odkvp join --prepipe '.${PATHSEP}mlr cat' -j a -f test/input/join-het.dkvp test/input/abixy-het
mlr --odkvp join --prepipe '${MLR} cat' -j a -f test/input/join-het.dkvp test/input/abixy-het

2
test/cases-not-suitable-for-ci/verb-join-prepipe/0003/cmd
View file

@ -1 +1 @@
mlr --prepipe '.${PATHSEP}mlr cat' --odkvp join --prepipe cat -j a -f test/input/join-het.dkvp test/input/abixy-het
mlr --prepipe '${MLR} cat' --odkvp join --prepipe cat -j a -f test/input/join-het.dkvp test/input/abixy-het

2
test/cases/io-compressed-input/0001/cmd
View file

@ -1 +1 @@
mlr --csv --prepipe '.${PATHSEP}mlr --csv cat' cat test/input/rfc-csv/simple.csv-crlf
mlr --csv --prepipe '${MLR} --csv cat' cat test/input/rfc-csv/simple.csv-crlf

2
test/cases/io-compressed-input/0002/cmd
View file

@ -1 +1 @@
mlr --dkvp --prepipe '.${PATHSEP}mlr cat' cat test/input/abixy
mlr --dkvp --prepipe '${MLR} cat' cat test/input/abixy

2
test/cases/io-compressed-input/0003/cmd
View file

@ -1 +1 @@
mlr --csv --prepipe '.${PATHSEP}mlr --csv cat' cat < test/input/rfc-csv/simple.csv-crlf
mlr --csv --prepipe '${MLR} --csv cat' cat < test/input/rfc-csv/simple.csv-crlf

2
test/cases/io-compressed-input/0004/cmd
View file

@ -1 +1 @@
mlr --dkvp --prepipe '.${PATHSEP}mlr cat' cat < test/input/abixy
mlr --dkvp --prepipe '${MLR} cat' cat < test/input/abixy