Skip to content

Commit 5071387

Browse files
committed
sbs: improve multi line debug print
Minor change so multi words elements are printed more nicely on the screen, removing a redundant newline. So instead of: TITLE: EL0 EL1 ... We now have: TITLE: EL0 EL1 ... Signed-off-by: Omer Caspi <[email protected]>
1 parent 44ec52b commit 5071387

File tree

2 files changed

+21
-12
lines changed

2 files changed

+21
-12
lines changed

module.inc.mk

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -338,10 +338,11 @@ define SbsDbgVar
338338
if [[ -n $${VALUE} || $${SBS_FORCE_DBG} -eq 1 ]] && \
339339
[[ -z $${SBS_DBG_TERMS} || $${NAME} == *"$${SBS_DBG_TERMS}"* ]]; then \
340340
if (( $${#VALUE} > $$(tput cols) -30 -5 )); then \
341-
printf "%s:\n" $${NAME}; \
342-
for i in $${VALUE}; do \
343-
printf "%-30s%s\n" "" "$${i}"; \
344-
done;\
341+
read -ra elements <<< "$${VALUE}"; \
342+
printf "%-30s%s\n" $${NAME}: "$${elements[0]}"; \
343+
for (( i =1; i < $${#elements[@]}; i++ )); do \
344+
printf "%-30s%s\n" "" "$${elements[$$i]}"; \
345+
done; \
345346
else \
346347
printf "%-30s%s\n" $${NAME}: "$${VALUE}"; \
347348
fi; \

test/002_binaries/expected_output.txt

Lines changed: 16 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,8 @@ Cleaning 'prog-with-out-of-tree-src'
1414
Cleaning 'prog2' order=[prog2_dynlib prog2]
1515
Cleaning 'prog2_dynlib'
1616
Cleaning 'prog_nobin'
17-
Cleaning 'prog-nobin-extern'
17+
Cleaning 'prog-nobin-extern' order=[../nobin prog-nobin-extern]
18+
Cleaning 'nobin'
1819

1920
Building binaries
2021
-----------------
@@ -30,7 +31,8 @@ Building 'prog-with-out-of-tree-src'
3031
Building 'prog2' order=[prog2_dynlib prog2]
3132
Building 'prog2_dynlib'
3233
Building 'prog_nobin'
33-
Building 'prog-nobin-extern'
34+
Building 'prog-nobin-extern' order=[../nobin prog-nobin-extern]
35+
Building 'nobin'
3436

3537
Checking binaries output
3638
------------------------
@@ -113,7 +115,8 @@ Cleaning 'prog-with-out-of-tree-src'
113115
Cleaning 'prog2' order=[prog2_dynlib prog2]
114116
Cleaning 'prog2_dynlib'
115117
Cleaning 'prog_nobin'
116-
Cleaning 'prog-nobin-extern'
118+
Cleaning 'prog-nobin-extern' order=[../nobin prog-nobin-extern]
119+
Cleaning 'nobin'
117120

118121
Building binaries
119122
-----------------
@@ -129,7 +132,8 @@ Building 'prog-with-out-of-tree-src'
129132
Building 'prog2' order=[prog2_dynlib prog2]
130133
Building 'prog2_dynlib'
131134
Building 'prog_nobin'
132-
Building 'prog-nobin-extern'
135+
Building 'prog-nobin-extern' order=[../nobin prog-nobin-extern]
136+
Building 'nobin'
133137

134138
Checking binaries output
135139
------------------------
@@ -212,7 +216,8 @@ Cleaning 'prog-with-out-of-tree-src'
212216
Cleaning 'prog2' order=[prog2_dynlib prog2]
213217
Cleaning 'prog2_dynlib'
214218
Cleaning 'prog_nobin'
215-
Cleaning 'prog-nobin-extern'
219+
Cleaning 'prog-nobin-extern' order=[../nobin prog-nobin-extern]
220+
Cleaning 'nobin'
216221

217222
Building binaries
218223
-----------------
@@ -228,7 +233,8 @@ Building 'prog-with-out-of-tree-src'
228233
Building 'prog2' order=[prog2_dynlib prog2]
229234
Building 'prog2_dynlib'
230235
Building 'prog_nobin'
231-
Building 'prog-nobin-extern'
236+
Building 'prog-nobin-extern' order=[../nobin prog-nobin-extern]
237+
Building 'nobin'
232238

233239
Checking binaries output
234240
------------------------
@@ -311,7 +317,8 @@ Cleaning 'prog-with-out-of-tree-src'
311317
Cleaning 'prog2' order=[prog2_dynlib prog2]
312318
Cleaning 'prog2_dynlib'
313319
Cleaning 'prog_nobin'
314-
Cleaning 'prog-nobin-extern'
320+
Cleaning 'prog-nobin-extern' order=[../nobin prog-nobin-extern]
321+
Cleaning 'nobin'
315322

316323
Building binaries
317324
-----------------
@@ -327,7 +334,8 @@ Building 'prog-with-out-of-tree-src'
327334
Building 'prog2' order=[prog2_dynlib prog2]
328335
Building 'prog2_dynlib'
329336
Building 'prog_nobin'
330-
Building 'prog-nobin-extern'
337+
Building 'prog-nobin-extern' order=[../nobin prog-nobin-extern]
338+
Building 'nobin'
331339

332340
Checking binaries output
333341
------------------------

0 commit comments

Comments
 (0)