Browse Source

Fix forgotten beakerlibism of rlFileSubmit()

Alois Mahdal 6 years ago
parent
commit
44efcf5325
1 changed files with 14 additions and 14 deletions
  1. 14
    14
      src/jat_dump.sh.skel

+ 14
- 14
src/jat_dump.sh.skel View File

60
 
60
 
61
 
61
 
62
 #
62
 #
63
-# Limit in lines before rlFileSubmit is used instead of printing
63
+# Limit in lines before jat__submit() is used instead of printing
64
 #
64
 #
65
 JAT_DUMP__LIMIT_L=${JAT_DUMP__LIMIT_L:-100}
65
 JAT_DUMP__LIMIT_L=${JAT_DUMP__LIMIT_L:-100}
66
 
66
 
67
 
67
 
68
 #
68
 #
69
-# Limit in bytes before rlFileSubmit is used instead of printing
69
+# Limit in bytes before jat__submit() is used instead of printing
70
 #
70
 #
71
 JAT_DUMP__LIMIT_B=${JAT_DUMP__LIMIT_B:-10000}
71
 JAT_DUMP__LIMIT_B=${JAT_DUMP__LIMIT_B:-10000}
72
 
72
 
89
     #
89
     #
90
     # Print contents of given file(s) to the main TESTOUT.log
90
     # Print contents of given file(s) to the main TESTOUT.log
91
     # using jat_log* functions and adding BEGIN/END delimiters.
91
     # using jat_log* functions and adding BEGIN/END delimiters.
92
-    # If a file is too big, use rlFileSubmit instead.  If a file
92
+    # If a file is too big, use jat__submit() instead.  If a file
93
     # is binary, pipe it through `hexdump -C`.
93
     # is binary, pipe it through `hexdump -C`.
94
     #
94
     #
95
     # Options:
95
     # Options:
100
     #   *  -b BYTES, --max-bytes BYTES
100
     #   *  -b BYTES, --max-bytes BYTES
101
     #   *  -l LINES, --max-lines LINES
101
     #   *  -l LINES, --max-lines LINES
102
     #               set limit to lines or bytes; if file is bigger,
102
     #               set limit to lines or bytes; if file is bigger,
103
-    #               use rlFileSubmit instead
103
+    #               use jat__submit() instead
104
     #   *  -I, --info
104
     #   *  -I, --info
105
     #   *  -E, --error
105
     #   *  -E, --error
106
     #   *  -D, --debug
106
     #   *  -D, --debug
186
     # Cache contents of stream given on STDIN and print them to
186
     # Cache contents of stream given on STDIN and print them to
187
     # the main TESTOUT.log using jat__log* functions and adding
187
     # the main TESTOUT.log using jat__log* functions and adding
188
     # BEGIN/END delimiters.  If the content is too big, use
188
     # BEGIN/END delimiters.  If the content is too big, use
189
-    # rlFileSubmit instead.  If the content is binary, pipe it
189
+    # jat__submit() instead.  If the content is binary, pipe it
190
     # through `hexdump -C`.
190
     # through `hexdump -C`.
191
     #
191
     #
192
     # NAME will appear along with pipe content delimiters,  and
192
     # NAME will appear along with pipe content delimiters,  and
193
     # if a limit is reached, will be used as name for file to
193
     # if a limit is reached, will be used as name for file to
194
-    # store using rlFileSubmit.  NAME will be generated if
194
+    # store using jat__submit().  NAME will be generated if
195
     # omitted.
195
     # omitted.
196
     #
196
     #
197
     # Options:
197
     # Options:
202
     #   *  -b BYTES, --max-bytes BYTES
202
     #   *  -b BYTES, --max-bytes BYTES
203
     #   *  -l LINES, --max-lines LINES
203
     #   *  -l LINES, --max-lines LINES
204
     #               set limit to lines or bytes; if file is bigger,
204
     #               set limit to lines or bytes; if file is bigger,
205
-    #               use rlFileSubmit instead
205
+    #               use jat__submit() instead
206
     #   *  -I, --info
206
     #   *  -I, --info
207
     #   *  -E, --error
207
     #   *  -E, --error
208
     #   *  -D, --debug
208
     #   *  -D, --debug
289
     # Dump the object type $1 from $2, or save it under name $3
289
     # Dump the object type $1 from $2, or save it under name $3
290
     #
290
     #
291
     # Type can be FILE, HEXDUMP or PIPE.  If object is too big to dump
291
     # Type can be FILE, HEXDUMP or PIPE.  If object is too big to dump
292
-    # to log, it will be submitted using rlFileSubmit. in that case
292
+    # to log, it will be submitted using jat__submit(). in that case
293
     # $3 may be specified as alternative name.
293
     # $3 may be specified as alternative name.
294
     #
294
     #
295
     # In case of HEXDUMP, path to original file must be specified
295
     # In case of HEXDUMP, path to original file must be specified
308
     local oname=${3:-$opath}    # chosen name
308
     local oname=${3:-$opath}    # chosen name
309
     local oorig=$4              # original file in case of HEXDUMP
309
     local oorig=$4              # original file in case of HEXDUMP
310
     local bloat=""              # human description of limit excess; empty
310
     local bloat=""              # human description of limit excess; empty
311
-                                # .. means OK to dump to log; else use rlFileSubmit
311
+                                # .. means OK to dump to log; else use jat__submit()
312
     local lline=""              # logged line
312
     local lline=""              # logged line
313
 
313
 
314
     oname="$(tr / - <<<"$oname")"
314
     oname="$(tr / - <<<"$oname")"
344
         case $otype in
344
         case $otype in
345
             FILE)
345
             FILE)
346
                 jat__log_info "not dumping, file has too many $bloat: $opath"
346
                 jat__log_info "not dumping, file has too many $bloat: $opath"
347
-                rlFileSubmit -- "$opath" "$oname"
347
+                jat__submit "$opath" "$oname"
348
                 ;;
348
                 ;;
349
             PIPE)
349
             PIPE)
350
                 jat__log_info "not dumping, pipe has too many $bloat: $oname"
350
                 jat__log_info "not dumping, pipe has too many $bloat: $oname"
351
-                rlFileSubmit -- "$opath" "$oname.pipe"
351
+                jat__submit "$opath" "$oname.pipe"
352
                 ;;
352
                 ;;
353
             HEXDUMP)
353
             HEXDUMP)
354
                 jat__log_info "not dumping, hexdump is too long for: $oorig"
354
                 jat__log_info "not dumping, hexdump is too long for: $oorig"
355
-                rlFileSubmit -- "$opath" "$oname.hex"
356
-                rlFileSubmit -- "$oorig" "$oname"
355
+                jat__submit "$opath" "$oname.hex"
356
+                jat__submit "$oorig" "$oname"
357
                 ;;
357
                 ;;
358
         esac
358
         esac
359
     fi
359
     fi
380
         always) return 0 ;;
380
         always) return 0 ;;
381
         never)  return 1 ;;
381
         never)  return 1 ;;
382
         auto)   __jat_dump__is_binary "$fpath"; return $? ;;
382
         auto)   __jat_dump__is_binary "$fpath"; return $? ;;
383
-        *)      rlFail "bad value of JAT_DUMP__HEXMODE: $hexmode" ;;
383
+        *)      jat__log_error "bad value of JAT_DUMP__HEXMODE: $hexmode" ;;
384
     esac
384
     esac
385
 }
385
 }
386
 
386