From 2218387a8cb9270a688775350a07b02db6d03103 Mon Sep 17 00:00:00 2001 From: Thierry Reding Date: Wed, 30 Sep 2015 13:16:12 +1000 Subject: fdt: Add a function to count strings Given a device tree node and a property name, the fdt_stringlist_count() function counts the number of strings found in the property value. This also adds a new error code, FDT_ERR_BADVALUE, that the function returns when it encounters a non-NUL-terminated string list. Signed-off-by: Thierry Reding [Changed testcase name --dwg] Signed-off-by: David Gibson --- tests/.gitignore | 1 + tests/Makefile.tests | 1 + tests/run_tests.sh | 3 ++ tests/stringlist.c | 82 ++++++++++++++++++++++++++++++++++++++++++++++++++++ tests/stringlist.dts | 12 ++++++++ 5 files changed, 99 insertions(+) create mode 100644 tests/stringlist.c create mode 100644 tests/stringlist.dts (limited to 'tests') diff --git a/tests/.gitignore b/tests/.gitignore index 5656555..e4532da 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -49,6 +49,7 @@ tmp.* /setprop_inplace /sized_cells /string_escapes +/stringlist /subnode_iterate /subnode_offset /supernode_atdepth_offset diff --git a/tests/Makefile.tests b/tests/Makefile.tests index 9adedec..f7c3a4b 100644 --- a/tests/Makefile.tests +++ b/tests/Makefile.tests @@ -9,6 +9,7 @@ LIB_TESTS_L = get_mem_rsv \ sized_cells \ notfound \ addr_size_cells \ + stringlist \ setprop_inplace nop_property nop_node \ sw_tree1 \ move_and_save mangle-layout nopulate \ diff --git a/tests/run_tests.sh b/tests/run_tests.sh index 5268293..1063d1e 100755 --- a/tests/run_tests.sh +++ b/tests/run_tests.sh @@ -198,6 +198,9 @@ libfdt_tests () { run_dtc_test -I dts -O dtb -o addresses.test.dtb addresses.dts run_test addr_size_cells addresses.test.dtb + run_dtc_test -I dts -O dtb -o stringlist.test.dtb stringlist.dts + run_test stringlist stringlist.test.dtb + # Sequential write tests run_test sw_tree1 tree1_tests sw_tree1.test.dtb diff --git a/tests/stringlist.c b/tests/stringlist.c new file mode 100644 index 0000000..923e2ed --- /dev/null +++ b/tests/stringlist.c @@ -0,0 +1,82 @@ +/* + * libfdt - Flat Device Tree manipulation + * Testcase for string handling + * Copyright (C) 2015 NVIDIA Corporation + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public License + * as published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, but + * WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + */ + +#include +#include +#include +#include + +#include + +#include "tests.h" +#include "testdata.h" + +static void check_expected_failure(const void *fdt, const char *path, + const char *property) +{ + int offset, err; + + offset = fdt_path_offset(fdt, "/"); + if (offset < 0) + FAIL("Couldn't find path %s", path); + + err = fdt_stringlist_count(fdt, offset, "#address-cells"); + if (err != -FDT_ERR_BADVALUE) + FAIL("unexpectedly succeeded in parsing #address-cells\n"); +} + +static void check_string_count(const void *fdt, const char *path, + const char *property, int count) +{ + int offset, err; + + offset = fdt_path_offset(fdt, path); + if (offset < 0) + FAIL("Couldn't find path %s", path); + + err = fdt_stringlist_count(fdt, offset, property); + if (err < 0) + FAIL("Couldn't count strings in property %s of node %s: %d\n", + property, path, err); + + if (err != count) + FAIL("String count for property %s of node %s is %d instead of %d\n", + path, property, err, count); +} + +int main(int argc, char *argv[]) +{ + void *fdt; + + if (argc != 2) + CONFIG("Usage: %s \n", argv[0]); + + test_init(argc, argv); + fdt = load_blob(argv[1]); + + check_expected_failure(fdt, "/", "#address-cells"); + check_expected_failure(fdt, "/", "#size-cells"); + + check_string_count(fdt, "/", "compatible", 1); + check_string_count(fdt, "/device", "compatible", 2); + check_string_count(fdt, "/device", "big-endian", 0); + + PASS(); +} diff --git a/tests/stringlist.dts b/tests/stringlist.dts new file mode 100644 index 0000000..1e4d314 --- /dev/null +++ b/tests/stringlist.dts @@ -0,0 +1,12 @@ +/dts-v1/; + +/ { + compatible = "test-strings"; + #address-cells = <2>; + #size-cells = <2>; + + device { + compatible = "foo", "bar"; + big-endian; + }; +}; -- cgit v1.2.3