diff options
| author | Simon Glass <sjg@chromium.org> | 2012-03-02 17:12:07 -0800 |
|---|---|---|
| committer | Jon Loeliger <jdl@jdl.com> | 2012-03-07 13:25:03 -0600 |
| commit | 097ec97c1a35685957210adb93692c3e210bc82c (patch) | |
| tree | 5331cc1eb4e0706816ef87e67df38786848d6d0b | |
| parent | a6e6c60e3a97a6b3a033cd052bb3740fd53cbf4c (diff) | |
| download | device-tree-compiler-097ec97c1a35685957210adb93692c3e210bc82c.tar.gz | |
fdtget: Fix multiple arg bug and add test for it
There is a rather unfortunate bug in fdtget in that if multiple argument
sets are provided, it just repeats displaying the first set ones for
each set.
Fix this bug and add a test for it.
Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: David Gibson <david@gibson.dropbear.id.au>
| -rw-r--r-- | fdtget.c | 6 | ||||
| -rwxr-xr-x | tests/fdtget-runtest.sh | 2 | ||||
| -rwxr-xr-x | tests/run_tests.sh | 3 |
3 files changed, 7 insertions, 4 deletions
@@ -146,13 +146,13 @@ static int do_fdtget(struct display_info *disp, const char *filename, return -1; for (i = 0; i + 2 <= arg_count; i += 2) { - node = fdt_path_offset(blob, arg[0]); + node = fdt_path_offset(blob, arg[i]); if (node < 0) { - report_error(arg[0], node); + report_error(arg[i], node); return -1; } - if (show_data_for_item(blob, disp, node, arg[1])) + if (show_data_for_item(blob, disp, node, arg[i + 1])) return -1; } return 0; diff --git a/tests/fdtget-runtest.sh b/tests/fdtget-runtest.sh index dac7f9a..982fbe1 100755 --- a/tests/fdtget-runtest.sh +++ b/tests/fdtget-runtest.sh @@ -8,7 +8,7 @@ rm -f $LOG $EXPECT trap "rm -f $LOG $EXPECT" 0 expect="$1" -echo $expect >$EXPECT +echo -e $expect >$EXPECT shift verbose_run_log_check "$LOG" $VALGRIND $DTGET "$@" diff --git a/tests/run_tests.sh b/tests/run_tests.sh index a561433..ac6fa17 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -475,6 +475,9 @@ fdtget_tests () { run_fdtget_test "61 62 63 0 12 34 0 0 0 a 0 0 0 b 0 0 0 c" \ -thhx $dtb /randomnode mixed run_wrap_error_test $DTGET -ts $dtb /randomnode doctor-who + + # Test multiple arguments + run_fdtget_test "MyBoardName\nmemory" -ts $dtb / model /memory device_type } fdtput_tests () { |