From 0bce86120e09121ecb3a986d4eaabb2ba25ff5db Mon Sep 17 00:00:00 2001 From: John Kerl Date: Thu, 4 Aug 2016 22:15:24 -0400 Subject: [PATCH] emit-all UTs --- c/reg_test/expected/out | 78 +++++++++++++++++++++++++++++++++++++---- c/reg_test/run | 34 +++++++++++++----- 2 files changed, 97 insertions(+), 15 deletions(-) diff --git a/c/reg_test/expected/out b/c/reg_test/expected/out index a002f81bf..edff76961 100644 --- a/c/reg_test/expected/out +++ b/c/reg_test/expected/out @@ -27335,7 +27335,7 @@ hat dog 37.114244 78 0.475824 ================================================================ -MAPPER TEE +MAPPER TEE REDIRECTS mlr --from ./reg_test/input/abixy tee ./output/tee1/out then nothing @@ -27391,7 +27391,7 @@ n=20,a=pan,b=wye,i=10,x=0.5026260055412137,y=0.9526183602969864 ================================================================ -DSL TEE +DSL TEE REDIRECTS mlr put -q tee > "./output/tee2/out.".$a, $* ./reg_test/input/abixy @@ -27471,7 +27471,7 @@ n=4,a=zee,b=wye,i=8,x=0.5985540091064224,y=0.976181385699006 ================================================================ -DSL PRINT +DSL PRINT REDIRECTS mlr put -q print > "./output/print1/out.".$a, "abi:".$a.$b.$i ./reg_test/input/abixy @@ -27549,6 +27549,10 @@ n=2,1=abi:zeewye8 n=3,1=abi:zeepan6 n=4,1=abi:zeewye8 + +================================================================ +DSL PRINTN REDIRECTS + mlr put -q printn > "./output/printn1/out.".$a, "abi:".$a.$b.$i ./reg_test/input/abixy mlr cat -n ./output/printn1/out.eks @@ -27602,7 +27606,7 @@ n=1,1=abi:zeepan6abi:zeewye8abi:zeepan6abi:zeewye8 ================================================================ -DSL DUMP +DSL DUMP REDIRECTS mlr put -q @v=$*; dump > "./output/dump1/out.".$a ./reg_test/input/abixy @@ -27682,7 +27686,7 @@ mlr --json cat -n ./output/dump1/out.zee ================================================================ -DSL EMITF +DSL EMITF REDIRECTS mlr put -q @a=$a; @b=$b; emitf > "./output/emitf1/out.".$a.$b, @a, @b ./reg_test/input/abixy @@ -27792,7 +27796,7 @@ n=2,a=zee,b=wye ================================================================ -DSL EMITP +DSL EMITP REDIRECTS mlr head -n 4 then put -q @a[NR]=$a; @b[NR]=$b; emitp > "./output/emitp1/out.".$a.$b, (@a, @b) ./reg_test/input/abixy @@ -27910,9 +27914,69 @@ n=4,NR=1,a=pan,b=pan n=5,NR=2,a=eks,b=pan n=6,NR=3,a=wye,b=wye +mlr head -n 4 then put -q @a[NR]=$a; @b[NR]=$b; emitp > "./output/emitp3/out.".$a.$b, @*, "NR" ./reg_test/input/abixy + +mlr cat -n ./output/emitp3/out.ekspan +n=1,NR=1,a=pan +n=2,NR=2,a=eks +n=3,NR=1,b=pan +n=4,NR=2,b=pan + +mlr cat -n ./output/emitp3/out.ekswye +n=1,NR=1,a=pan +n=2,NR=2,a=eks +n=3,NR=3,a=wye +n=4,NR=4,a=eks +n=5,NR=1,b=pan +n=6,NR=2,b=pan +n=7,NR=3,b=wye +n=8,NR=4,b=wye + +mlr cat -n ./output/emitp3/out.panpan +n=1,NR=1,a=pan +n=2,NR=1,b=pan + +mlr cat -n ./output/emitp3/out.wyewye +n=1,NR=1,a=pan +n=2,NR=2,a=eks +n=3,NR=3,a=wye +n=4,NR=1,b=pan +n=5,NR=2,b=pan +n=6,NR=3,b=wye + +mlr head -n 4 then put -q @a[NR]=$a; @b[NR]=$b; emitp > "./output/emitp4/out.".$a.$b, all, "NR" ./reg_test/input/abixy + +mlr cat -n ./output/emitp4/out.ekspan +n=1,NR=1,a=pan +n=2,NR=2,a=eks +n=3,NR=1,b=pan +n=4,NR=2,b=pan + +mlr cat -n ./output/emitp4/out.ekswye +n=1,NR=1,a=pan +n=2,NR=2,a=eks +n=3,NR=3,a=wye +n=4,NR=4,a=eks +n=5,NR=1,b=pan +n=6,NR=2,b=pan +n=7,NR=3,b=wye +n=8,NR=4,b=wye + +mlr cat -n ./output/emitp4/out.panpan +n=1,NR=1,a=pan +n=2,NR=1,b=pan + +mlr cat -n ./output/emitp4/out.wyewye +n=1,NR=1,a=pan +n=2,NR=2,a=eks +n=3,NR=3,a=wye +n=4,NR=1,b=pan +n=5,NR=2,b=pan +n=6,NR=3,b=wye + ================================================================ -DSL EMIT +DSL EMIT REDIRECTS mlr head -n 4 then put -q @a[NR]=$a; @b[NR]=$b; emit > "./output/emit1/out.".$a.$b, (@a, @b) ./reg_test/input/abixy diff --git a/c/reg_test/run b/c/reg_test/run index e9855ab11..738ef74c6 100755 --- a/c/reg_test/run +++ b/c/reg_test/run @@ -3427,7 +3427,7 @@ run_mlr --from $indir/abixy-wide --opprint put -q ' ' # ---------------------------------------------------------------- -announce MAPPER TEE +announce MAPPER TEE REDIRECTS tee1=$reloutdir/tee1 mkdir -p $tee1 @@ -3442,7 +3442,7 @@ run_mlr --from $indir/abixy tee -a $tee1/out then nothing run_mlr cat -n $tee1/out # ---------------------------------------------------------------- -announce DSL TEE +announce DSL TEE REDIRECTS tee2=$reloutdir/tee2 mkdir -p $tee2 @@ -3469,7 +3469,7 @@ run_mlr cat -n $tee2/out.wye run_mlr cat -n $tee2/out.zee # ---------------------------------------------------------------- -announce DSL PRINT +announce DSL PRINT REDIRECTS print1=$reloutdir/print1 mkdir -p $print1 @@ -3496,7 +3496,7 @@ run_mlr cat -n $print1/out.wye run_mlr cat -n $print1/out.zee # ---------------------------------------------------------------- -announce DSL PRINTN +announce DSL PRINTN REDIRECTS printn1=$reloutdir/printn1 mkdir -p $printn1 @@ -3523,7 +3523,7 @@ run_mlr cat -n $printn1/out.wye run_mlr cat -n $printn1/out.zee # ---------------------------------------------------------------- -announce DSL DUMP +announce DSL DUMP REDIRECTS dump1=$reloutdir/dump1 mkdir -p $dump1 @@ -3550,7 +3550,7 @@ run_mlr --json cat -n $dump1/out.wye run_mlr --json cat -n $dump1/out.zee # ---------------------------------------------------------------- -announce DSL EMITF +announce DSL EMITF REDIRECTS emitf1=$reloutdir/emitf1 mkdir -p $emitf1 @@ -3592,7 +3592,7 @@ run_mlr cat -n $emitf1/out.zeepan run_mlr cat -n $emitf1/out.zeewye # ---------------------------------------------------------------- -announce DSL EMITP +announce DSL EMITP REDIRECTS emitp1=$reloutdir/emitp1 mkdir -p $emitp1 @@ -3636,8 +3636,26 @@ run_mlr cat -n $emitp2/out.ekswye run_mlr cat -n $emitp2/out.panpan run_mlr cat -n $emitp2/out.wyewye +emitp3=$reloutdir/emitp3 +mkdir -p $emitp3 + +run_mlr head -n 4 then put -q '@a[NR]=$a; @b[NR]=$b; emitp > "'$emitp3'/out.".$a.$b, @*, "NR"' $indir/abixy +run_mlr cat -n $emitp3/out.ekspan +run_mlr cat -n $emitp3/out.ekswye +run_mlr cat -n $emitp3/out.panpan +run_mlr cat -n $emitp3/out.wyewye + +emitp4=$reloutdir/emitp4 +mkdir -p $emitp4 + +run_mlr head -n 4 then put -q '@a[NR]=$a; @b[NR]=$b; emitp > "'$emitp4'/out.".$a.$b, all, "NR"' $indir/abixy +run_mlr cat -n $emitp4/out.ekspan +run_mlr cat -n $emitp4/out.ekswye +run_mlr cat -n $emitp4/out.panpan +run_mlr cat -n $emitp4/out.wyewye + # ---------------------------------------------------------------- -announce DSL EMIT +announce DSL EMIT REDIRECTS emit1=$reloutdir/emit1 mkdir -p $emit1