diff --git a/c/reg_test/expected/out b/c/reg_test/expected/out index f17b5c722..061db6c93 100644 --- a/c/reg_test/expected/out +++ b/c/reg_test/expected/out @@ -56359,3 +56359,48 @@ i 10 x 0.5026260055412137 y 0.9526183602969864 +mlr lecat --mono ./reg_test/input/line-ending-cr.bin +hello[CR]there[CR]how[CR]are[CR]you[CR]mlr lecat --mono ./reg_test/input/line-ending-lf.bin +hello[LF] +there[LF] +how[LF] +are[LF] +you[LF] +mlr lecat --mono ./reg_test/input/line-ending-crlf.bin +hello[CR][LF] +there[CR][LF] +how[CR][LF] +are[CR][LF] +you[CR][LF] +mlr termcvt --cr2lf ./reg_test/input/line-ending-cr.bin +hello +there +how +are +you +mlr termcvt --cr2crlf ./reg_test/input/line-ending-cr.bin +hello +there +how +are +you +mlr termcvt --lf2cr ./reg_test/input/line-ending-lf.bin +hello there how are you mlr termcvt --lf2crlf ./reg_test/input/line-ending-lf.bin +hello +there +how +are +you +mlr termcvt --crlf2cr ./reg_test/input/line-ending-crlf.bin +hello there how are you mlr termcvt --crlf2lf ./reg_test/input/line-ending-crlf.bin +hello +there +how +are +you +mlr hex /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/line-ending-temp-1.bin +mlr hex /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/line-ending-temp-2.bin +mlr hex /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/line-ending-temp-3.bin +mlr hex /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/line-ending-temp-4.bin +mlr hex /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/line-ending-temp-5.bin +mlr hex /Users/kerl/pub_http_internet/miller-releases/miller-head/c/output-regtest/line-ending-temp-6.bin diff --git a/c/reg_test/run b/c/reg_test/run index 8669cbf8b..1dace2d8d 100755 --- a/c/reg_test/run +++ b/c/reg_test/run @@ -36,14 +36,20 @@ else exit 1 fi +# mlr lecat, mlr termcvt, etc. do not accept initial '--no-mmap'. +path_to_mlr_for_auxents="$path_to_mlr" + if [ "$1" = "--valgrind" ]; then # Leak-check the test suite. Needs 'make mlrg' first. # ../tools/clean-valg can be used to filter the output. path_to_mlr="valgrind --leak-check=full ${path_to_mlr}g" + path_to_mlr_for_auxents="$path_to_mlr" elif [ "$1" = "--no-mmap" ]; then + path_to_mlr_for_auxents="${path_to_mlr}" path_to_mlr="${path_to_mlr} --no-mmap" elif [ "$1" = "--valgrind-no-mmap" ]; then path_to_mlr="valgrind --leak-check=full ${path_to_mlr}g --no-mmap" + path_to_mlr_for_auxents="valgrind --leak-check=full ${path_to_mlr}g" fi echo Using mlr executable $path_to_mlr @@ -89,11 +95,11 @@ run_mlr() { num_completed=`expr $num_completed + 1` } -run_mlr_quiet() { +run_mlr_for_auxents() { # Use just "mlr" for info messages echo mlr "$@" >> $outfile # Use path to mlr for invoking the command - $path_to_mlr "$@" >> $outfile + $path_to_mlr_for_auxents "$@" >> $outfile # since set -e num_completed=`expr $num_completed + 1` } @@ -6588,24 +6594,23 @@ run_mlr --oxtab --from $indir/abixy-het put ' # ---------------------------------------------------------------- # AUX ENTRIES -# TO DO: awkward with/without --no-mmap -# run_mlr lecat --mono $indir/line-ending-cr.bin -# run_mlr lecat --mono $indir/line-ending-lf.bin -# run_mlr lecat --mono $indir/line-ending-crlf.bin +run_mlr_for_auxents lecat --mono $indir/line-ending-cr.bin +run_mlr_for_auxents lecat --mono $indir/line-ending-lf.bin +run_mlr_for_auxents lecat --mono $indir/line-ending-crlf.bin -# run_mlr_quiet termcvt --cr2lf $indir/line-ending-cr.bin > $outdir/line-ending-temp-1.bin -# run_mlr_quiet termcvt --cr2crlf $indir/line-ending-cr.bin > $outdir/line-ending-temp-2.bin -# run_mlr_quiet termcvt --lf2cr $indir/line-ending-lf.bin > $outdir/line-ending-temp-3.bin -# run_mlr_quiet termcvt --lf2crlf $indir/line-ending-lf.bin > $outdir/line-ending-temp-4.bin -# run_mlr_quiet termcvt --crlf2cr $indir/line-ending-crlf.bin > $outdir/line-ending-temp-5.bin -# run_mlr_quiet termcvt --crlf2lf $indir/line-ending-crlf.bin > $outdir/line-ending-temp-6.bin +run_mlr_for_auxents termcvt --cr2lf $indir/line-ending-cr.bin > $outdir/line-ending-temp-1.bin +run_mlr_for_auxents termcvt --cr2crlf $indir/line-ending-cr.bin > $outdir/line-ending-temp-2.bin +run_mlr_for_auxents termcvt --lf2cr $indir/line-ending-lf.bin > $outdir/line-ending-temp-3.bin +run_mlr_for_auxents termcvt --lf2crlf $indir/line-ending-lf.bin > $outdir/line-ending-temp-4.bin +run_mlr_for_auxents termcvt --crlf2cr $indir/line-ending-crlf.bin > $outdir/line-ending-temp-5.bin +run_mlr_for_auxents termcvt --crlf2lf $indir/line-ending-crlf.bin > $outdir/line-ending-temp-6.bin -# run_mlr hex $outdir/line-ending-temp-1.bin -# run_mlr hex $outdir/line-ending-temp-2.bin -# run_mlr hex $outdir/line-ending-temp-3.bin -# run_mlr hex $outdir/line-ending-temp-4.bin -# run_mlr hex $outdir/line-ending-temp-5.bin -# run_mlr hex $outdir/line-ending-temp-6.bin +run_mlr_for_auxents hex $outdir/line-ending-temp-1.bin +run_mlr_for_auxents hex $outdir/line-ending-temp-2.bin +run_mlr_for_auxents hex $outdir/line-ending-temp-3.bin +run_mlr_for_auxents hex $outdir/line-ending-temp-4.bin +run_mlr_for_auxents hex $outdir/line-ending-temp-5.bin +run_mlr_for_auxents hex $outdir/line-ending-temp-6.bin # ================================================================ # A key feature of this regression script is that it can be invoked from any diff --git a/doc/manpage.html b/doc/manpage.html index 85fd8c0dd..40fbe0c47 100644 --- a/doc/manpage.html +++ b/doc/manpage.html @@ -2220,7 +2220,7 @@ SEE ALSO - 2017-05-14 MILLER(1) + 2017-05-15 MILLER(1)

diff --git a/doc/manpage.txt b/doc/manpage.txt index 0ac9cfa63..9fc8c34a5 100644 --- a/doc/manpage.txt +++ b/doc/manpage.txt @@ -2027,4 +2027,4 @@ SEE ALSO - 2017-05-14 MILLER(1) + 2017-05-15 MILLER(1) diff --git a/doc/mlr.1 b/doc/mlr.1 index 63c91ca97..7114674c4 100644 --- a/doc/mlr.1 +++ b/doc/mlr.1 @@ -2,12 +2,12 @@ .\" Title: mlr .\" Author: [see the "AUTHOR" section] .\" Generator: ./mkman.rb -.\" Date: 2017-05-14 +.\" Date: 2017-05-15 .\" Manual: \ \& .\" Source: \ \& .\" Language: English .\" -.TH "MILLER" "1" "2017-05-14" "\ \&" "\ \&" +.TH "MILLER" "1" "2017-05-15" "\ \&" "\ \&" .\" ----------------------------------------------------------------- .\" * Portability definitions .\" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~