|
@@ -60,13 +60,13 @@ JAT_DUMP__HEXCMD=${JAT_DUMP__HEXCMD:-hexdump -C}
|
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
|
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
|
71
|
JAT_DUMP__LIMIT_B=${JAT_DUMP__LIMIT_B:-10000}
|
72
|
72
|
|
|
@@ -89,7 +89,7 @@ jat_dump__file() {
|
89
|
89
|
#
|
90
|
90
|
# Print contents of given file(s) to the main TESTOUT.log
|
91
|
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
|
93
|
# is binary, pipe it through `hexdump -C`.
|
94
|
94
|
#
|
95
|
95
|
# Options:
|
|
@@ -100,7 +100,7 @@ jat_dump__file() {
|
100
|
100
|
# * -b BYTES, --max-bytes BYTES
|
101
|
101
|
# * -l LINES, --max-lines LINES
|
102
|
102
|
# set limit to lines or bytes; if file is bigger,
|
103
|
|
- # use rlFileSubmit instead
|
|
103
|
+ # use jat__submit() instead
|
104
|
104
|
# * -I, --info
|
105
|
105
|
# * -E, --error
|
106
|
106
|
# * -D, --debug
|
|
@@ -186,12 +186,12 @@ jat_dump__pipe() {
|
186
|
186
|
# Cache contents of stream given on STDIN and print them to
|
187
|
187
|
# the main TESTOUT.log using jat__log* functions and adding
|
188
|
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
|
190
|
# through `hexdump -C`.
|
191
|
191
|
#
|
192
|
192
|
# NAME will appear along with pipe content delimiters, and
|
193
|
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
|
195
|
# omitted.
|
196
|
196
|
#
|
197
|
197
|
# Options:
|
|
@@ -202,7 +202,7 @@ jat_dump__pipe() {
|
202
|
202
|
# * -b BYTES, --max-bytes BYTES
|
203
|
203
|
# * -l LINES, --max-lines LINES
|
204
|
204
|
# set limit to lines or bytes; if file is bigger,
|
205
|
|
- # use rlFileSubmit instead
|
|
205
|
+ # use jat__submit() instead
|
206
|
206
|
# * -I, --info
|
207
|
207
|
# * -E, --error
|
208
|
208
|
# * -D, --debug
|
|
@@ -289,7 +289,7 @@ __jat_dump__logobj() {
|
289
|
289
|
# Dump the object type $1 from $2, or save it under name $3
|
290
|
290
|
#
|
291
|
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
|
293
|
# $3 may be specified as alternative name.
|
294
|
294
|
#
|
295
|
295
|
# In case of HEXDUMP, path to original file must be specified
|
|
@@ -308,7 +308,7 @@ __jat_dump__logobj() {
|
308
|
308
|
local oname=${3:-$opath} # chosen name
|
309
|
309
|
local oorig=$4 # original file in case of HEXDUMP
|
310
|
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
|
312
|
local lline="" # logged line
|
313
|
313
|
|
314
|
314
|
oname="$(tr / - <<<"$oname")"
|
|
@@ -344,16 +344,16 @@ __jat_dump__logobj() {
|
344
|
344
|
case $otype in
|
345
|
345
|
FILE)
|
346
|
346
|
jat__log_info "not dumping, file has too many $bloat: $opath"
|
347
|
|
- rlFileSubmit -- "$opath" "$oname"
|
|
347
|
+ jat__submit "$opath" "$oname"
|
348
|
348
|
;;
|
349
|
349
|
PIPE)
|
350
|
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
|
353
|
HEXDUMP)
|
354
|
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
|
358
|
esac
|
359
|
359
|
fi
|
|
@@ -380,7 +380,7 @@ __jat_dump__use_hex() {
|
380
|
380
|
always) return 0 ;;
|
381
|
381
|
never) return 1 ;;
|
382
|
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
|
384
|
esac
|
385
|
385
|
}
|
386
|
386
|
|