From 985c2324042a29a4529d4352fbd9ebd4bdbcabaf Mon Sep 17 00:00:00 2001 From: John Kerl Date: Thu, 4 Aug 2016 22:25:12 -0400 Subject: [PATCH] emit-all UTs --- c/reg_test/expected/out | 108 +++++++++++++++++++++++++++++++++------- c/reg_test/run | 44 ++++++++++++++-- 2 files changed, 130 insertions(+), 22 deletions(-) diff --git a/c/reg_test/expected/out b/c/reg_test/expected/out index c68ce4329..3556e492c 100644 --- a/c/reg_test/expected/out +++ b/c/reg_test/expected/out @@ -27914,15 +27914,51 @@ 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 head -n 4 then put -q @a[NR]=$a; @b[NR]=$b; emitp > "./output/emitp3/out.".$a.$b, @* ./reg_test/input/abixy mlr cat -n ./output/emitp3/out.ekspan +n=1,a:1=pan,a:2=eks +n=2,b:1=pan,b:2=pan + +mlr cat -n ./output/emitp3/out.ekswye +n=1,a:1=pan,a:2=eks,a:3=wye,a:4=eks +n=2,b:1=pan,b:2=pan,b:3=wye,b:4=wye + +mlr cat -n ./output/emitp3/out.panpan +n=1,a:1=pan +n=2,b:1=pan + +mlr cat -n ./output/emitp3/out.wyewye +n=1,a:1=pan,a:2=eks,a:3=wye +n=2,b:1=pan,b:2=pan,b:3=wye + +mlr head -n 4 then put -q @a[NR]=$a; @b[NR]=$b; emitp > "./output/emitp4/out.".$a.$b, all ./reg_test/input/abixy + +mlr cat -n ./output/emitp4/out.ekspan +n=1,a:1=pan,a:2=eks +n=2,b:1=pan,b:2=pan + +mlr cat -n ./output/emitp4/out.ekswye +n=1,a:1=pan,a:2=eks,a:3=wye,a:4=eks +n=2,b:1=pan,b:2=pan,b:3=wye,b:4=wye + +mlr cat -n ./output/emitp4/out.panpan +n=1,a:1=pan +n=2,b:1=pan + +mlr cat -n ./output/emitp4/out.wyewye +n=1,a:1=pan,a:2=eks,a:3=wye +n=2,b:1=pan,b:2=pan,b:3=wye + +mlr head -n 4 then put -q @a[NR]=$a; @b[NR]=$b; emitp > "./output/emitp5/out.".$a.$b, @*, "NR" ./reg_test/input/abixy + +mlr cat -n ./output/emitp5/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 +mlr cat -n ./output/emitp5/out.ekswye n=1,NR=1,a=pan n=2,NR=2,a=eks n=3,NR=3,a=wye @@ -27932,11 +27968,11 @@ 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 +mlr cat -n ./output/emitp5/out.panpan n=1,NR=1,a=pan n=2,NR=1,b=pan -mlr cat -n ./output/emitp3/out.wyewye +mlr cat -n ./output/emitp5/out.wyewye n=1,NR=1,a=pan n=2,NR=2,a=eks n=3,NR=3,a=wye @@ -27944,15 +27980,15 @@ 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 head -n 4 then put -q @a[NR]=$a; @b[NR]=$b; emitp > "./output/emitp6/out.".$a.$b, all, "NR" ./reg_test/input/abixy -mlr cat -n ./output/emitp4/out.ekspan +mlr cat -n ./output/emitp6/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 +mlr cat -n ./output/emitp6/out.ekswye n=1,NR=1,a=pan n=2,NR=2,a=eks n=3,NR=3,a=wye @@ -27962,11 +27998,11 @@ 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 +mlr cat -n ./output/emitp6/out.panpan n=1,NR=1,a=pan n=2,NR=1,b=pan -mlr cat -n ./output/emitp4/out.wyewye +mlr cat -n ./output/emitp6/out.wyewye n=1,NR=1,a=pan n=2,NR=2,a=eks n=3,NR=3,a=wye @@ -28094,15 +28130,51 @@ 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; emit > "./output/emit3/out.".$a.$b, @*, "NR" ./reg_test/input/abixy +mlr head -n 4 then put -q @a[NR]=$a; @b[NR]=$b; emit > "./output/emit3/out.".$a.$b, @* ./reg_test/input/abixy mlr cat -n ./output/emit3/out.ekspan +n=1,1=pan,2=eks +n=2,1=pan,2=pan + +mlr cat -n ./output/emit3/out.ekswye +n=1,1=pan,2=eks,3=wye,4=eks +n=2,1=pan,2=pan,3=wye,4=wye + +mlr cat -n ./output/emit3/out.panpan +n=1,1=pan +n=2,1=pan + +mlr cat -n ./output/emit3/out.wyewye +n=1,1=pan,2=eks,3=wye +n=2,1=pan,2=pan,3=wye + +mlr head -n 4 then put -q @a[NR]=$a; @b[NR]=$b; emit > "./output/emit4/out.".$a.$b, all ./reg_test/input/abixy + +mlr cat -n ./output/emit4/out.ekspan +n=1,1=pan,2=eks +n=2,1=pan,2=pan + +mlr cat -n ./output/emit4/out.ekswye +n=1,1=pan,2=eks,3=wye,4=eks +n=2,1=pan,2=pan,3=wye,4=wye + +mlr cat -n ./output/emit4/out.panpan +n=1,1=pan +n=2,1=pan + +mlr cat -n ./output/emit4/out.wyewye +n=1,1=pan,2=eks,3=wye +n=2,1=pan,2=pan,3=wye + +mlr head -n 4 then put -q @a[NR]=$a; @b[NR]=$b; emit > "./output/emit5/out.".$a.$b, @*, "NR" ./reg_test/input/abixy + +mlr cat -n ./output/emit5/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/emit3/out.ekswye +mlr cat -n ./output/emit5/out.ekswye n=1,NR=1,a=pan n=2,NR=2,a=eks n=3,NR=3,a=wye @@ -28112,11 +28184,11 @@ n=6,NR=2,b=pan n=7,NR=3,b=wye n=8,NR=4,b=wye -mlr cat -n ./output/emit3/out.panpan +mlr cat -n ./output/emit5/out.panpan n=1,NR=1,a=pan n=2,NR=1,b=pan -mlr cat -n ./output/emit3/out.wyewye +mlr cat -n ./output/emit5/out.wyewye n=1,NR=1,a=pan n=2,NR=2,a=eks n=3,NR=3,a=wye @@ -28124,15 +28196,15 @@ 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; emit > "./output/emit4/out.".$a.$b, all, "NR" ./reg_test/input/abixy +mlr head -n 4 then put -q @a[NR]=$a; @b[NR]=$b; emit > "./output/emit6/out.".$a.$b, all, "NR" ./reg_test/input/abixy -mlr cat -n ./output/emit4/out.ekspan +mlr cat -n ./output/emit6/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/emit4/out.ekswye +mlr cat -n ./output/emit6/out.ekswye n=1,NR=1,a=pan n=2,NR=2,a=eks n=3,NR=3,a=wye @@ -28142,11 +28214,11 @@ n=6,NR=2,b=pan n=7,NR=3,b=wye n=8,NR=4,b=wye -mlr cat -n ./output/emit4/out.panpan +mlr cat -n ./output/emit6/out.panpan n=1,NR=1,a=pan n=2,NR=1,b=pan -mlr cat -n ./output/emit4/out.wyewye +mlr cat -n ./output/emit6/out.wyewye n=1,NR=1,a=pan n=2,NR=2,a=eks n=3,NR=3,a=wye diff --git a/c/reg_test/run b/c/reg_test/run index 903d699aa..6ede741ac 100755 --- a/c/reg_test/run +++ b/c/reg_test/run @@ -3639,7 +3639,7 @@ 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 head -n 4 then put -q '@a[NR]=$a; @b[NR]=$b; emitp > "'$emitp3'/out.".$a.$b, @*' $indir/abixy run_mlr cat -n $emitp3/out.ekspan run_mlr cat -n $emitp3/out.ekswye run_mlr cat -n $emitp3/out.panpan @@ -3648,12 +3648,30 @@ 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 head -n 4 then put -q '@a[NR]=$a; @b[NR]=$b; emitp > "'$emitp4'/out.".$a.$b, all' $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 +emitp5=$reloutdir/emitp5 +mkdir -p $emitp5 + +run_mlr head -n 4 then put -q '@a[NR]=$a; @b[NR]=$b; emitp > "'$emitp5'/out.".$a.$b, @*, "NR"' $indir/abixy +run_mlr cat -n $emitp5/out.ekspan +run_mlr cat -n $emitp5/out.ekswye +run_mlr cat -n $emitp5/out.panpan +run_mlr cat -n $emitp5/out.wyewye + +emitp6=$reloutdir/emitp6 +mkdir -p $emitp6 + +run_mlr head -n 4 then put -q '@a[NR]=$a; @b[NR]=$b; emitp > "'$emitp6'/out.".$a.$b, all, "NR"' $indir/abixy +run_mlr cat -n $emitp6/out.ekspan +run_mlr cat -n $emitp6/out.ekswye +run_mlr cat -n $emitp6/out.panpan +run_mlr cat -n $emitp6/out.wyewye + # ---------------------------------------------------------------- announce DSL EMIT REDIRECTS @@ -3702,7 +3720,7 @@ run_mlr cat -n $emit2/out.wyewye emit3=$reloutdir/emit3 mkdir -p $emit3 -run_mlr head -n 4 then put -q '@a[NR]=$a; @b[NR]=$b; emit > "'$emit3'/out.".$a.$b, @*, "NR"' $indir/abixy +run_mlr head -n 4 then put -q '@a[NR]=$a; @b[NR]=$b; emit > "'$emit3'/out.".$a.$b, @*' $indir/abixy run_mlr cat -n $emit3/out.ekspan run_mlr cat -n $emit3/out.ekswye run_mlr cat -n $emit3/out.panpan @@ -3711,12 +3729,30 @@ run_mlr cat -n $emit3/out.wyewye emit4=$reloutdir/emit4 mkdir -p $emit4 -run_mlr head -n 4 then put -q '@a[NR]=$a; @b[NR]=$b; emit > "'$emit4'/out.".$a.$b, all, "NR"' $indir/abixy +run_mlr head -n 4 then put -q '@a[NR]=$a; @b[NR]=$b; emit > "'$emit4'/out.".$a.$b, all' $indir/abixy run_mlr cat -n $emit4/out.ekspan run_mlr cat -n $emit4/out.ekswye run_mlr cat -n $emit4/out.panpan run_mlr cat -n $emit4/out.wyewye +emit5=$reloutdir/emit5 +mkdir -p $emit5 + +run_mlr head -n 4 then put -q '@a[NR]=$a; @b[NR]=$b; emit > "'$emit5'/out.".$a.$b, @*, "NR"' $indir/abixy +run_mlr cat -n $emit5/out.ekspan +run_mlr cat -n $emit5/out.ekswye +run_mlr cat -n $emit5/out.panpan +run_mlr cat -n $emit5/out.wyewye + +emit6=$reloutdir/emit6 +mkdir -p $emit6 + +run_mlr head -n 4 then put -q '@a[NR]=$a; @b[NR]=$b; emit > "'$emit6'/out.".$a.$b, all, "NR"' $indir/abixy +run_mlr cat -n $emit6/out.ekspan +run_mlr cat -n $emit6/out.ekswye +run_mlr cat -n $emit6/out.panpan +run_mlr cat -n $emit6/out.wyewye + # ---------------------------------------------------------------- announce OOSVAR-FROM-SREC ASSIGNMENT