Fix caseid merging

src/jat.sh.skel

@@ -893,13 +893,12 @@ __jat__log_event() {
     local EType=$1; shift
     local msg
     local meatfn
-    local caseid=$JAT__TEST_ID
     local beids=()
     local data=()
     local origin=${FUNCNAME[1]}
     local pcaseid
     local CaseIdBase=$JAT__TEST_ID
-    pcaseid=$(__jat__sd_keyR P.caseid)
+    pcaseid=$(__jat__sd_keyR P.pcaseid)
     test -n "$pcaseid" && CaseIdBase+=":$pcaseid"
     case $EType in
         ASSERT.PASS|ASSERT.FAIL) : ;;
@@ -936,7 +935,7 @@ __jat__log_event() {
 
 __jat__log_evt_pstart() {
     #
-    #     __jat__log_event PHASE.START ID NAME TYPE [caseid=CASEID] [pdir=PDIR]
+    #     __jat__log_event PHASE.START ID NAME TYPE [pcaseid=CASEID] [pdir=PDIR]
     #
     local pid=$1; shift
     local pname=$1; shift
@@ -963,6 +962,10 @@ __jat__log_evt_assert() {
     local hint=$1; shift
     local caseid=$1; shift
     local data=("$@")
+    case $caseid in
+        "") caseid=$CaseIdBase ;;
+        *)  caseid=$CaseIdBase:$caseid ;;
+    esac
     __jat__yamls 2 hint "$hint"
     __jat__yamls 2 caseid "$caseid"
     __jat__yamld 2 data "${data[@]}"
@@ -1026,9 +1029,9 @@ __jat__pstart() {
     __jat__sd_keyw phase "$newphase"
     __jat__sd_keyw P.type "$type"
     __jat__sd_keyw P.name "$name"
-    __jat__sd_keyw P.caseid "$pcaseid"
+    __jat__sd_keyw P.pcaseid "$pcaseid"
     __jat__show_pstart "$name"
-    __jat__log_event PHASE.START "$newphase" "$name" "$type" "caseid=$pcaseid" "pdir=$pdir"
+    __jat__log_event PHASE.START "$newphase" "$name" "$type" "pcaseid=$pcaseid" "pdir=$pdir"
     test -n "$pdir" && {
         __jat__sd_keyw P.pdir "$pdir"
         __jat__sd_keyw P.PWD "$PWD"

tests/basic/oracle/ylog_both.stdout

@@ -19,7 +19,7 @@ events:
             name: |-4
                 _jat_anon_phase_
         data:
-            caseid: ~
+            pcaseid: ~
             pdir: ~
     -
         etype: MESSAGE.INFO
@@ -32,7 +32,8 @@ events:
         stamp: time-5
         hint: |-4
             true is true
-        caseid: ~
+        caseid: |-4
+            _jat_anon_test_
         data:
             t.cmd: |-4
                 true
@@ -51,7 +52,8 @@ events:
         stamp: time-7
         hint: |-4
             false is true
-        caseid: ~
+        caseid: |-4
+            _jat_anon_test_
         data:
             t.cmd: |-4
                 false

tests/basic/oracle/ylog_fail.stdout

@@ -19,7 +19,7 @@ events:
             name: |-4
                 _jat_anon_phase_
         data:
-            caseid: ~
+            pcaseid: ~
             pdir: ~
     -
         etype: MESSAGE.INFO
@@ -32,7 +32,8 @@ events:
         stamp: time-5
         hint: |-4
             true is false
-        caseid: ~
+        caseid: |-4
+            _jat_anon_test_
         data:
             t.cmd: |-4
                 true
@@ -51,7 +52,8 @@ events:
         stamp: time-7
         hint: |-4
             false is true
-        caseid: ~
+        caseid: |-4
+            _jat_anon_test_
         data:
             t.cmd: |-4
                 false

tests/basic/oracle/ylog_pass.stdout

@@ -19,7 +19,7 @@ events:
             name: |-4
                 _jat_anon_phase_
         data:
-            caseid: ~
+            pcaseid: ~
             pdir: ~
     -
         etype: MESSAGE.INFO
@@ -32,7 +32,8 @@ events:
         stamp: time-5
         hint: |-4
             true is true
-        caseid: ~
+        caseid: |-4
+            _jat_anon_test_
         data:
             t.cmd: |-4
                 true
@@ -51,7 +52,8 @@ events:
         stamp: time-7
         hint: |-4
             false is false
-        caseid: ~
+        caseid: |-4
+            _jat_anon_test_
         data:
             t.cmd: |-4
                 false