On Mon, Oct 07, 2019 at 11:17:59PM +0400, marcandre.lureau@xxxxxxxxxx wrote:
> From: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
>
> meson runs out-of-tree, add absolute path location where necessary.
I think this change is a good idea, even if we don't move to meson
long term. I've long thought that the dtc make & test stuff had an
inconvenient dependence on exactly where it was run, I just haven't
had the time to fix it.
The only downside is it makes the output of run_tests.sh a bit less
readable since a bunch of those SRCDIR paths are shown there as well
as used internally.
If you can think of a way to avoid that, that'd be great, but if not
(and I can't think of one quickly) it's not a showstopper.
>
> Signed-off-by: Marc-André Lureau <marcandre.lureau@xxxxxxxxxx>
> ---
> tests/dtc-checkfails.sh | 3 +-
> tests/dtc-fails.sh | 3 +-
> tests/dtc-fatal.sh | 3 +-
> tests/fdtdump-runtest.sh | 3 +-
> tests/fdtget-runtest.sh | 3 +-
> tests/fdtoverlay-runtest.sh | 3 +-
> tests/fdtput-runtest.sh | 3 +-
> tests/incbin.c | 6 +-
> tests/run_tests.sh | 330 ++++++++++++++++++------------------
> 9 files changed, 185 insertions(+), 172 deletions(-)
> mode change 100644 => 100755 tests/dtc-fatal.sh
> mode change 100644 => 100755 tests/fdtdump-runtest.sh
> mode change 100644 => 100755 tests/fdtoverlay-runtest.sh
> mode change 100644 => 100755 tests/fdtput-runtest.sh
>
> diff --git a/tests/dtc-checkfails.sh b/tests/dtc-checkfails.sh
> index 0e8beb4..4fd9691 100755
> --- a/tests/dtc-checkfails.sh
> +++ b/tests/dtc-checkfails.sh
> @@ -1,6 +1,7 @@
> #! /bin/sh
>
> -. ./testutils.sh
> +SRCDIR=`dirname "$0"`
> +. "$SRCDIR/testutils.sh"
>
> for x; do
> shift
> diff --git a/tests/dtc-fails.sh b/tests/dtc-fails.sh
> index 4543203..855b623 100755
> --- a/tests/dtc-fails.sh
> +++ b/tests/dtc-fails.sh
> @@ -1,6 +1,7 @@
> #! /bin/sh
>
> -. ./testutils.sh
> +SRCDIR=`dirname "$0"`
> +. "$SRCDIR/testutils.sh"
>
> if [ "$1" = "-n" ]; then
> NEG="$1"
> diff --git a/tests/dtc-fatal.sh b/tests/dtc-fatal.sh
> old mode 100644
> new mode 100755
> index 22eea69..08a4d29
> --- a/tests/dtc-fatal.sh
> +++ b/tests/dtc-fatal.sh
> @@ -1,6 +1,7 @@
> #! /bin/sh
>
> -. ./testutils.sh
> +SRCDIR=`dirname "$0"`
> +. "$SRCDIR/testutils.sh"
>
> verbose_run $VALGRIND "$DTC" -o/dev/null "$@"
> ret="$?"
> diff --git a/tests/fdtdump-runtest.sh b/tests/fdtdump-runtest.sh
> old mode 100644
> new mode 100755
> index 616c737..71ac861
> --- a/tests/fdtdump-runtest.sh
> +++ b/tests/fdtdump-runtest.sh
> @@ -4,7 +4,8 @@
> # $1 - source file to compile and compare with fdtdump output of the
> # compiled file.
>
> -. ./testutils.sh
> +SRCDIR=`dirname "$0"`
> +. "$SRCDIR/testutils.sh"
>
> dts="$1"
> dtb="${dts}.dtb"
> diff --git a/tests/fdtget-runtest.sh b/tests/fdtget-runtest.sh
> index 21044f3..18b7404 100755
> --- a/tests/fdtget-runtest.sh
> +++ b/tests/fdtget-runtest.sh
> @@ -1,6 +1,7 @@
> #! /bin/sh
>
> -. ./testutils.sh
> +SRCDIR=`dirname "$0"`
> +. "$SRCDIR/testutils.sh"
>
> LOG=tmp.log.$$
> EXPECT=tmp.expect.$$
> diff --git a/tests/fdtoverlay-runtest.sh b/tests/fdtoverlay-runtest.sh
> old mode 100644
> new mode 100755
> index 7c54beb..0c648f4
> --- a/tests/fdtoverlay-runtest.sh
> +++ b/tests/fdtoverlay-runtest.sh
> @@ -6,7 +6,8 @@
> # Usage
> # fdtoverlay-runtest.sh name expected_output dtb_file node property flags value
>
> -. ./testutils.sh
> +SRCDIR=`dirname "$0"`
> +. "$SRCDIR/testutils.sh"
>
> LOG=tmp.log.$$
> EXPECT=tmp.expect.$$
> diff --git a/tests/fdtput-runtest.sh b/tests/fdtput-runtest.sh
> old mode 100644
> new mode 100755
> index a1f7b85..1210eab
> --- a/tests/fdtput-runtest.sh
> +++ b/tests/fdtput-runtest.sh
> @@ -6,7 +6,8 @@
> # Usage
> # fdtput-runtest.sh name expected_output dtb_file node property flags value
>
> -. ./testutils.sh
> +SRCDIR=`dirname "$0"`
> +. "$SRCDIR/testutils.sh"
>
> LOG=tmp.log.$$
> EXPECT=tmp.expect.$$
> diff --git a/tests/incbin.c b/tests/incbin.c
> index fd02609..8ed70d2 100644
> --- a/tests/incbin.c
> +++ b/tests/incbin.c
> @@ -52,7 +52,11 @@ int main(int argc, char *argv[])
>
> test_init(argc, argv);
>
> - incbin = load_file("incbin.bin", &len);
> + if (argc != 3)
> + FAIL("Missing arguments");
> +
> + incbin = load_file(argv[2], &len);
> + argc--;
> fdt = load_blob_arg(argc, argv);
>
> check_getprop(fdt, 0, "incbin", len, incbin);
> diff --git a/tests/run_tests.sh b/tests/run_tests.sh
> index 2620332..f5bdcfb 100755
> --- a/tests/run_tests.sh
> +++ b/tests/run_tests.sh
> @@ -1,6 +1,7 @@
> #! /bin/sh
>
> -. ./testutils.sh
> +SRCDIR=`dirname "$0"`
> +. "$SRCDIR/testutils.sh"
>
> if [ -z "$CC" ]; then
> CC=gcc
> @@ -149,7 +150,7 @@ run_dtc_test () {
> }
>
> asm_to_so () {
> - $CC -shared -o $1.test.so data.S $1.test.s
> + $CC -shared -o $1.test.so "$SRCDIR/data.S" $1.test.s
> }
>
> asm_to_so_test () {
> @@ -160,7 +161,7 @@ run_fdtget_test () {
> expect="$1"
> shift
> printf "fdtget-runtest.sh %s $*: " "$(echo $expect)"
> - base_run_test sh fdtget-runtest.sh "$expect" "$@"
> + base_run_test sh "$SRCDIR/fdtget-runtest.sh" "$expect" "$@"
> }
>
> run_fdtput_test () {
> @@ -168,14 +169,14 @@ run_fdtput_test () {
> shift
> shorten_echo fdtput-runtest.sh "$expect" "$@"
> printf ": "
> - base_run_test sh fdtput-runtest.sh "$expect" "$@"
> + base_run_test sh "$SRCDIR/fdtput-runtest.sh" "$expect" "$@"
> }
>
> run_fdtdump_test() {
> file="$1"
> shorten_echo fdtdump-runtest.sh "$file"
> printf ": "
> - base_run_test sh fdtdump-runtest.sh "$file" 2>/dev/null
> + base_run_test sh "$SRCDIR/fdtdump-runtest.sh" "$file" 2>/dev/null
> }
>
> run_fdtoverlay_test() {
> @@ -183,7 +184,7 @@ run_fdtoverlay_test() {
> shift
> shorten_echo fdtoverlay-runtest.sh "$expect" "$@"
> printf ": "
> - base_run_test sh fdtoverlay-runtest.sh "$expect" "$@"
> + base_run_test sh "$SRCDIR/fdtoverlay-runtest.sh" "$expect" "$@"
> }
>
> BAD_FIXUP_TREES="bad_index \
> @@ -198,12 +199,12 @@ BAD_FIXUP_TREES="bad_index \
> # Test to exercise libfdt overlay application without dtc's overlay support
> libfdt_overlay_tests () {
> # First test a doctored overlay which requires only local fixups
> - run_dtc_test -I dts -O dtb -o overlay_base_no_symbols.test.dtb overlay_base.dts
> + run_dtc_test -I dts -O dtb -o overlay_base_no_symbols.test.dtb "$SRCDIR/overlay_base.dts"
> run_test check_path overlay_base_no_symbols.test.dtb not-exists "/__symbols__"
> run_test check_path overlay_base_no_symbols.test.dtb not-exists "/__fixups__"
> run_test check_path overlay_base_no_symbols.test.dtb not-exists "/__local_fixups__"
>
> - run_dtc_test -I dts -O dtb -o overlay_overlay_no_fixups.test.dtb overlay_overlay_no_fixups.dts
> + run_dtc_test -I dts -O dtb -o overlay_overlay_no_fixups.test.dtb "$SRCDIR/overlay_overlay_no_fixups.dts"
> run_test check_path overlay_overlay_no_fixups.test.dtb not-exists "/__symbols__"
> run_test check_path overlay_overlay_no_fixups.test.dtb not-exists "/__fixups__"
> run_test check_path overlay_overlay_no_fixups.test.dtb exists "/__local_fixups__"
> @@ -211,12 +212,12 @@ libfdt_overlay_tests () {
> run_test overlay overlay_base_no_symbols.test.dtb overlay_overlay_no_fixups.test.dtb
>
> # Then test with manually constructed fixups
> - run_dtc_test -I dts -O dtb -o overlay_base_manual_symbols.test.dtb overlay_base_manual_symbols.dts
> + run_dtc_test -I dts -O dtb -o overlay_base_manual_symbols.test.dtb "$SRCDIR/overlay_base_manual_symbols.dts"
> run_test check_path overlay_base_manual_symbols.test.dtb exists "/__symbols__"
> run_test check_path overlay_base_manual_symbols.test.dtb not-exists "/__fixups__"
> run_test check_path overlay_base_manual_symbols.test.dtb not-exists "/__local_fixups__"
>
> - run_dtc_test -I dts -O dtb -o overlay_overlay_manual_fixups.test.dtb overlay_overlay_manual_fixups.dts
> + run_dtc_test -I dts -O dtb -o overlay_overlay_manual_fixups.test.dtb "$SRCDIR/overlay_overlay_manual_fixups.dts"
> run_test check_path overlay_overlay_manual_fixups.test.dtb not-exists "/__symbols__"
> run_test check_path overlay_overlay_manual_fixups.test.dtb exists "/__fixups__"
> run_test check_path overlay_overlay_manual_fixups.test.dtb exists "/__local_fixups__"
> @@ -224,7 +225,7 @@ libfdt_overlay_tests () {
> run_test overlay overlay_base_manual_symbols.test.dtb overlay_overlay_manual_fixups.test.dtb
>
> # test simplified plugin syntax
> - run_dtc_test -@ -I dts -O dtb -o overlay_overlay_simple.dtb overlay_overlay_simple.dts
> + run_dtc_test -@ -I dts -O dtb -o overlay_overlay_simple.dtb "$SRCDIR/overlay_overlay_simple.dts"
>
> # verify non-generation of local fixups
> run_test check_path overlay_overlay_simple.dtb not-exists "/__local_fixups__"
> @@ -232,7 +233,7 @@ libfdt_overlay_tests () {
> # Bad fixup tests
> for test in $BAD_FIXUP_TREES; do
> tree="overlay_bad_fixup_$test"
> - run_dtc_test -I dts -O dtb -o $tree.test.dtb $tree.dts
> + run_dtc_test -I dts -O dtb -o $tree.test.dtb "$SRCDIR/$tree.dts"
> run_test overlay_bad_fixup overlay_base_no_symbols.test.dtb $tree.test.dtb
> done
> }
> @@ -240,45 +241,45 @@ libfdt_overlay_tests () {
> # Tests to exercise dtc's overlay generation support
> dtc_overlay_tests () {
> # Overlay tests for dtc
> - run_dtc_test -@ -I dts -O dtb -o overlay_base.test.dtb overlay_base.dts
> + run_dtc_test -@ -I dts -O dtb -o overlay_base.test.dtb "$SRCDIR/overlay_base.dts"
> run_test check_path overlay_base.test.dtb exists "/__symbols__"
> run_test check_path overlay_base.test.dtb not-exists "/__fixups__"
> run_test check_path overlay_base.test.dtb not-exists "/__local_fixups__"
>
> # With syntactic sugar
> - run_dtc_test -I dts -O dtb -o overlay_overlay.test.dtb overlay_overlay.dts
> + run_dtc_test -I dts -O dtb -o overlay_overlay.test.dtb "$SRCDIR/overlay_overlay.dts"
> run_test check_path overlay_overlay.test.dtb not-exists "/__symbols__"
> run_test check_path overlay_overlay.test.dtb exists "/__fixups__"
> run_test check_path overlay_overlay.test.dtb exists "/__local_fixups__"
>
> # Without syntactic sugar
> - run_dtc_test -I dts -O dtb -o overlay_overlay_nosugar.test.dtb overlay_overlay.dts
> + run_dtc_test -I dts -O dtb -o overlay_overlay_nosugar.test.dtb "$SRCDIR/overlay_overlay.dts"
> run_test check_path overlay_overlay_nosugar.test.dtb not-exists "/__symbols__"
> run_test check_path overlay_overlay_nosugar.test.dtb exists "/__fixups__"
> run_test check_path overlay_overlay_nosugar.test.dtb exists "/__local_fixups__"
>
> # Using target-path
> - run_dtc_test -I dts -O dtb -o overlay_overlay_bypath.test.dtb overlay_overlay_bypath.dts
> + run_dtc_test -I dts -O dtb -o overlay_overlay_bypath.test.dtb "$SRCDIR/overlay_overlay_bypath.dts"
> run_test check_path overlay_overlay_bypath.test.dtb not-exists "/__symbols__"
> run_test check_path overlay_overlay_bypath.test.dtb not-exists "/__fixups__"
> run_test check_path overlay_overlay_bypath.test.dtb exists "/__local_fixups__"
>
> # Make sure local target references are resolved and nodes are merged and that path references are not
> - run_dtc_test -I dts -O dtb -o overlay_overlay_local_merge.test.dtb overlay_overlay_local_merge.dts
> + run_dtc_test -I dts -O dtb -o overlay_overlay_local_merge.test.dtb "$SRCDIR/overlay_overlay_local_merge.dts"
> run_test check_path overlay_overlay_local_merge.test.dtb exists "/fragment@0/__overlay__/new-node/new-merged-node"
> run_test check_path overlay_overlay_local_merge.test.dtb exists "/fragment@1/__overlay__/new-root-node"
>
> # Check building works the same as manual constructions
> run_test dtbs_equal_ordered overlay_overlay.test.dtb overlay_overlay_nosugar.test.dtb
>
> - run_dtc_test -I dts -O dtb -o overlay_overlay_manual_fixups.test.dtb overlay_overlay_manual_fixups.dts
> + run_dtc_test -I dts -O dtb -o overlay_overlay_manual_fixups.test.dtb "$SRCDIR/overlay_overlay_manual_fixups.dts"
> run_test dtbs_equal_ordered overlay_overlay.test.dtb overlay_overlay_manual_fixups.test.dtb
>
> - run_dtc_test -I dts -O dtb -o overlay_overlay_no_fixups.test.dtb overlay_overlay_no_fixups.dts
> + run_dtc_test -I dts -O dtb -o overlay_overlay_no_fixups.test.dtb "$SRCDIR/overlay_overlay_no_fixups.dts"
> run_test dtbs_equal_ordered overlay_overlay_bypath.test.dtb overlay_overlay_no_fixups.test.dtb
>
> # Check we can actually apply the result
> - run_dtc_test -I dts -O dtb -o overlay_base_no_symbols.test.dtb overlay_base.dts
> + run_dtc_test -I dts -O dtb -o overlay_base_no_symbols.test.dtb "$SRCDIR/overlay_base.dts"
> run_test overlay overlay_base.test.dtb overlay_overlay.test.dtb
> run_test overlay overlay_base_no_symbols.test.dtb overlay_overlay_bypath.test.dtb
>
> @@ -288,7 +289,7 @@ dtc_overlay_tests () {
> run_test dtbs_equal_ordered overlay_overlay.test.dtb overlay_overlay_decompile.test.dtb
>
> # Test generation of aliases instead of symbols
> - run_dtc_test -A -I dts -O dtb -o overlay_base_with_aliases.dtb overlay_base.dts
> + run_dtc_test -A -I dts -O dtb -o overlay_base_with_aliases.dtb "$SRCDIR/overlay_base.dts"
> run_test check_path overlay_base_with_aliases.dtb exists "/aliases"
> run_test check_path overlay_base_with_aliases.dtb not-exists "/__symbols__"
> run_test check_path overlay_base_with_aliases.dtb not-exists "/__fixups__"
> @@ -336,9 +337,9 @@ tree1_tests_rw () {
> check_tests () {
> tree="$1"
> shift
> - run_sh_test dtc-checkfails.sh "$@" -- -I dts -O dtb $tree
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" "$@" -- -I dts -O dtb $tree
> run_dtc_test -I dts -O dtb -o $tree.test.dtb -f $tree
> - run_sh_test dtc-checkfails.sh "$@" -- -I dtb -O dtb $tree.test.dtb
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" "$@" -- -I dtb -O dtb $tree.test.dtb
> }
>
> ALL_LAYOUTS="mts mst tms tsm smt stm"
> @@ -346,12 +347,12 @@ ALL_LAYOUTS="mts mst tms tsm smt stm"
> libfdt_tests () {
> tree1_tests test_tree1.dtb
>
> - run_dtc_test -I dts -O dtb -o addresses.test.dtb addresses.dts
> + run_dtc_test -I dts -O dtb -o addresses.test.dtb "$SRCDIR/addresses.dts"
> run_test addr_size_cells addresses.test.dtb
> - run_dtc_test -I dts -O dtb -o addresses2.test.dtb empty.dts
> + run_dtc_test -I dts -O dtb -o addresses2.test.dtb "$SRCDIR/empty.dts"
> run_test addr_size_cells2 addresses2.test.dtb
>
> - run_dtc_test -I dts -O dtb -o stringlist.test.dtb stringlist.dts
> + run_dtc_test -I dts -O dtb -o stringlist.test.dtb "$SRCDIR/stringlist.dts"
> run_test stringlist stringlist.test.dtb
>
> for flags in default no_name_dedup; do
> @@ -412,7 +413,7 @@ libfdt_tests () {
> tree1_tests_rw rw_tree1.test.dtb
> run_test appendprop1
> run_test appendprop2 appendprop1.test.dtb
> - run_dtc_test -I dts -O dtb -o appendprop.test.dtb appendprop.dts
> + run_dtc_test -I dts -O dtb -o appendprop.test.dtb "$SRCDIR/appendprop.dts"
> run_test dtbs_equal_ordered appendprop2.test.dtb appendprop.test.dtb
> libfdt_overlay_tests
>
> @@ -425,13 +426,13 @@ libfdt_tests () {
>
> run_test rw_oom
>
> - run_dtc_test -I dts -O dtb -o subnode_iterate.dtb subnode_iterate.dts
> + run_dtc_test -I dts -O dtb -o subnode_iterate.dtb "$SRCDIR/subnode_iterate.dts"
> run_test subnode_iterate subnode_iterate.dtb
>
> - run_dtc_test -I dts -O dtb -o property_iterate.dtb property_iterate.dts
> + run_dtc_test -I dts -O dtb -o property_iterate.dtb "$SRCDIR/property_iterate.dts"
> run_test property_iterate property_iterate.dtb
>
> - run_dtc_test -I dts -O dtb -o unit-addr-without-reg.dtb unit-addr-without-reg.dts
> + run_dtc_test -I dts -O dtb -o unit-addr-without-reg.dtb "$SRCDIR/unit-addr-without-reg.dts"
> run_test appendprop_addrrange unit-addr-without-reg.dtb 1 1 1
> run_test appendprop_addrrange unit-addr-without-reg.dtb 2 2 2
> run_test appendprop_addrrange unit-addr-without-reg.dtb 2 1 3
> @@ -442,26 +443,26 @@ libfdt_tests () {
> run_test truncated_memrsv
>
> # Check aliases support in fdt_path_offset
> - run_dtc_test -I dts -O dtb -o aliases.dtb aliases.dts
> + run_dtc_test -I dts -O dtb -o aliases.dtb "$SRCDIR/aliases.dts"
> run_test get_alias aliases.dtb
> run_test path_offset_aliases aliases.dtb
>
> # Specific bug tests
> run_test add_subnode_with_nops
> - run_dtc_test -I dts -O dts -o sourceoutput.test.dts sourceoutput.dts
> - run_dtc_test -I dts -O dtb -o sourceoutput.test.dtb sourceoutput.dts
> + run_dtc_test -I dts -O dts -o sourceoutput.test.dts "$SRCDIR/sourceoutput.dts"
> + run_dtc_test -I dts -O dtb -o sourceoutput.test.dtb "$SRCDIR/sourceoutput.dts"
> run_dtc_test -I dts -O dtb -o sourceoutput.test.dts.test.dtb sourceoutput.test.dts
> run_test dtbs_equal_ordered sourceoutput.test.dtb sourceoutput.test.dts.test.dtb
>
> - run_dtc_test -I dts -O dtb -o embedded_nul.test.dtb embedded_nul.dts
> - run_dtc_test -I dts -O dtb -o embedded_nul_equiv.test.dtb embedded_nul_equiv.dts
> + run_dtc_test -I dts -O dtb -o embedded_nul.test.dtb "$SRCDIR/embedded_nul.dts"
> + run_dtc_test -I dts -O dtb -o embedded_nul_equiv.test.dtb "$SRCDIR/embedded_nul_equiv.dts"
> run_test dtbs_equal_ordered embedded_nul.test.dtb embedded_nul_equiv.test.dtb
>
> - run_dtc_test -I dts -O dtb bad-size-cells.dts
> + run_dtc_test -I dts -O dtb "$SRCDIR/bad-size-cells.dts"
>
> run_wrap_error_test $DTC division-by-zero.dts
> run_wrap_error_test $DTC bad-octal-literal.dts
> - run_dtc_test -I dts -O dtb nul-in-escape.dts
> + run_dtc_test -I dts -O dtb "$SRCDIR/nul-in-escape.dts"
> run_wrap_error_test $DTC nul-in-line-info1.dts
> run_wrap_error_test $DTC nul-in-line-info2.dts
>
> @@ -488,62 +489,62 @@ libfdt_tests () {
> }
>
> dtc_tests () {
> - run_dtc_test -I dts -O dtb -o dtc_tree1.test.dtb test_tree1.dts
> + run_dtc_test -I dts -O dtb -o dtc_tree1.test.dtb "$SRCDIR/test_tree1.dts"
> tree1_tests dtc_tree1.test.dtb
> tree1_tests_rw dtc_tree1.test.dtb
> run_test dtbs_equal_ordered dtc_tree1.test.dtb test_tree1.dtb
>
> - run_dtc_test -I dts -O dtb -o dtc_escapes.test.dtb propname_escapes.dts
> + run_dtc_test -I dts -O dtb -o dtc_escapes.test.dtb "$SRCDIR/propname_escapes.dts"
> run_test propname_escapes dtc_escapes.test.dtb
>
> - run_dtc_test -I dts -O dtb -o line_directives.test.dtb line_directives.dts
> + run_dtc_test -I dts -O dtb -o line_directives.test.dtb "$SRCDIR/line_directives.dts"
>
> - run_dtc_test -I dts -O dtb -o dtc_escapes.test.dtb escapes.dts
> + run_dtc_test -I dts -O dtb -o dtc_escapes.test.dtb "$SRCDIR/escapes.dts"
> run_test string_escapes dtc_escapes.test.dtb
>
> - run_dtc_test -I dts -O dtb -o dtc_char_literal.test.dtb char_literal.dts
> + run_dtc_test -I dts -O dtb -o dtc_char_literal.test.dtb "$SRCDIR/char_literal.dts"
> run_test char_literal dtc_char_literal.test.dtb
>
> - run_dtc_test -I dts -O dtb -o dtc_sized_cells.test.dtb sized_cells.dts
> + run_dtc_test -I dts -O dtb -o dtc_sized_cells.test.dtb "$SRCDIR/sized_cells.dts"
> run_test sized_cells dtc_sized_cells.test.dtb
>
> - run_dtc_test -I dts -O dtb -o dtc_extra-terminating-null.test.dtb extra-terminating-null.dts
> + run_dtc_test -I dts -O dtb -o dtc_extra-terminating-null.test.dtb "$SRCDIR/extra-terminating-null.dts"
> run_test extra-terminating-null dtc_extra-terminating-null.test.dtb
>
> - run_dtc_test -I dts -O dtb -o dtc_references.test.dtb references.dts
> + run_dtc_test -I dts -O dtb -o dtc_references.test.dtb "$SRCDIR/references.dts"
> run_test references dtc_references.test.dtb
>
> - run_dtc_test -I dts -O dtb -o dtc_path-references.test.dtb path-references.dts
> + run_dtc_test -I dts -O dtb -o dtc_path-references.test.dtb "$SRCDIR/path-references.dts"
> run_test path-references dtc_path-references.test.dtb
>
> run_test phandle_format dtc_references.test.dtb epapr
> for f in legacy epapr both; do
> - run_dtc_test -I dts -O dtb -H $f -o dtc_references.test.$f.dtb references.dts
> + run_dtc_test -I dts -O dtb -H $f -o dtc_references.test.$f.dtb "$SRCDIR/references.dts"
> run_test phandle_format dtc_references.test.$f.dtb $f
> done
>
> - run_dtc_test -I dts -O dtb -o multilabel.test.dtb multilabel.dts
> + run_dtc_test -I dts -O dtb -o multilabel.test.dtb "$SRCDIR/multilabel.dts"
> run_test references multilabel.test.dtb
>
> - run_dtc_test -I dts -O dtb -o label_repeated.test.dtb label_repeated.dts
> + run_dtc_test -I dts -O dtb -o label_repeated.test.dtb "$SRCDIR/label_repeated.dts"
>
> - run_dtc_test -I dts -O dtb -o dtc_comments.test.dtb comments.dts
> - run_dtc_test -I dts -O dtb -o dtc_comments-cmp.test.dtb comments-cmp.dts
> + run_dtc_test -I dts -O dtb -o dtc_comments.test.dtb "$SRCDIR/comments.dts"
> + run_dtc_test -I dts -O dtb -o dtc_comments-cmp.test.dtb "$SRCDIR/comments-cmp.dts"
> run_test dtbs_equal_ordered dtc_comments.test.dtb dtc_comments-cmp.test.dtb
>
> # Check /include/ directive
> - run_dtc_test -I dts -O dtb -o includes.test.dtb include0.dts
> + run_dtc_test -I dts -O dtb -o includes.test.dtb "$SRCDIR/include0.dts"
> run_test dtbs_equal_ordered includes.test.dtb test_tree1.dtb
>
> # Check /incbin/ directive
> - run_dtc_test -I dts -O dtb -o incbin.test.dtb incbin.dts
> - run_test incbin incbin.test.dtb
> + run_dtc_test -I dts -O dtb -o incbin.test.dtb "$SRCDIR/incbin.dts"
> + run_test incbin incbin.test.dtb "$SRCDIR/incbin.bin"
>
> # Check boot_cpuid_phys handling
> - run_dtc_test -I dts -O dtb -o boot_cpuid.test.dtb boot-cpuid.dts
> + run_dtc_test -I dts -O dtb -o boot_cpuid.test.dtb "$SRCDIR/boot-cpuid.dts"
> run_test boot-cpuid boot_cpuid.test.dtb 16
>
> - run_dtc_test -I dts -O dtb -b 17 -o boot_cpuid_17.test.dtb boot-cpuid.dts
> + run_dtc_test -I dts -O dtb -b 17 -o boot_cpuid_17.test.dtb "$SRCDIR/boot-cpuid.dts"
> run_test boot-cpuid boot_cpuid_17.test.dtb 17
>
> run_dtc_test -I dtb -O dtb -o preserve_boot_cpuid.test.dtb boot_cpuid.test.dtb
> @@ -565,9 +566,9 @@ dtc_tests () {
> for tree in test_tree1.dts escapes.dts references.dts path-references.dts \
> comments.dts aliases.dts include0.dts incbin.dts \
> value-labels.dts ; do
> - run_dtc_test -I dts -O asm -o oasm_$tree.test.s $tree
> + run_dtc_test -I dts -O asm -o oasm_$tree.test.s "$SRCDIR/$tree"
> asm_to_so_test oasm_$tree
> - run_dtc_test -I dts -O dtb -o $tree.test.dtb $tree
> + run_dtc_test -I dts -O dtb -o $tree.test.dtb "$SRCDIR/$tree"
> run_test asm_tree_dump ./oasm_$tree.test.so oasm_$tree.test.dtb
> run_wrap_test cmp oasm_$tree.test.dtb $tree.test.dtb
> done
> @@ -584,13 +585,13 @@ dtc_tests () {
>
> # Check -Odts preserving type information
> for tree in type-preservation.dts; do
> - run_dtc_test -I dts -O dts -o $tree.test.dts $tree
> + run_dtc_test -I dts -O dts -o $tree.test.dts "$SRCDIR/$tree"
> run_dtc_test -I dts -O dts $tree.test.dts
> - run_wrap_test cmp $tree $tree.test.dts
> + run_wrap_test cmp "$SRCDIR/$tree" $tree.test.dts
> done
> for tree in path-references; do
> - run_dtc_test -I dts -O dtb -o $tree.test.dtb $tree.dts
> - run_dtc_test -I dts -O dts -o $tree.test.dts $tree.dts
> + run_dtc_test -I dts -O dtb -o $tree.test.dtb "$SRCDIR/$tree.dts"
> + run_dtc_test -I dts -O dts -o $tree.test.dts "$SRCDIR/$tree.dts"
> run_dtc_test -I dts -O dtb -o $tree.test.dts.test.dtb $tree.test.dts
> run_test dtbs_equal_ordered $tree.test.dtb $tree.test.dts.test.dtb
> done
> @@ -598,8 +599,8 @@ dtc_tests () {
> # Check -Oyaml output
> if pkg-config --exists yaml-0.1; then
> for tree in type-preservation; do
> - run_dtc_test -I dts -O yaml -o $tree.test.dt.yaml $tree.dts
> - run_wrap_test cmp $tree.dt.yaml $tree.test.dt.yaml
> + run_dtc_test -I dts -O yaml -o $tree.test.dt.yaml "$SRCDIR/$tree.dts"
> + run_wrap_test cmp "$SRCDIR/$tree.dt.yaml" $tree.test.dt.yaml
> done
> fi
>
> @@ -617,102 +618,102 @@ dtc_tests () {
> done
>
> # Check merge/overlay functionality
> - run_dtc_test -I dts -O dtb -o dtc_tree1_merge.test.dtb test_tree1_merge.dts
> + run_dtc_test -I dts -O dtb -o dtc_tree1_merge.test.dtb "$SRCDIR/test_tree1_merge.dts"
> tree1_tests dtc_tree1_merge.test.dtb test_tree1.dtb
> - run_dtc_test -I dts -O dtb -o dtc_tree1_merge_labelled.test.dtb test_tree1_merge_labelled.dts
> + run_dtc_test -I dts -O dtb -o dtc_tree1_merge_labelled.test.dtb "$SRCDIR/test_tree1_merge_labelled.dts"
> tree1_tests dtc_tree1_merge_labelled.test.dtb test_tree1.dtb
> - run_dtc_test -I dts -O dtb -o dtc_tree1_label_noderef.test.dtb test_tree1_label_noderef.dts
> + run_dtc_test -I dts -O dtb -o dtc_tree1_label_noderef.test.dtb "$SRCDIR/test_tree1_label_noderef.dts"
> run_test dtbs_equal_unordered dtc_tree1_label_noderef.test.dtb test_tree1.dtb
> - run_dtc_test -I dts -O dtb -o multilabel_merge.test.dtb multilabel_merge.dts
> + run_dtc_test -I dts -O dtb -o multilabel_merge.test.dtb "$SRCDIR/multilabel_merge.dts"
> run_test references multilabel.test.dtb
> run_test dtbs_equal_ordered multilabel.test.dtb multilabel_merge.test.dtb
> - run_dtc_test -I dts -O dtb -o dtc_tree1_merge_path.test.dtb test_tree1_merge_path.dts
> + run_dtc_test -I dts -O dtb -o dtc_tree1_merge_path.test.dtb "$SRCDIR/test_tree1_merge_path.dts"
> tree1_tests dtc_tree1_merge_path.test.dtb test_tree1.dtb
> - run_wrap_error_test $DTC -I dts -O dtb -o /dev/null test_label_ref.dts
> + run_wrap_error_test $DTC -I dts -O dtb -o /dev/null "$SRCDIR/test_label_ref.dts"
>
> # Check prop/node delete functionality
> - run_dtc_test -I dts -O dtb -o dtc_tree1_delete.test.dtb test_tree1_delete.dts
> + run_dtc_test -I dts -O dtb -o dtc_tree1_delete.test.dtb "$SRCDIR/test_tree1_delete.dts"
> tree1_tests dtc_tree1_delete.test.dtb
>
> # Check omit-if-no-ref functionality
> - run_dtc_test -I dts -O dtb -o omit-no-ref.test.dtb omit-no-ref.dts
> + run_dtc_test -I dts -O dtb -o omit-no-ref.test.dtb "$SRCDIR/omit-no-ref.dts"
> run_test check_path omit-no-ref.test.dtb not-exists "/node1"
> run_test check_path omit-no-ref.test.dtb not-exists "/node2"
> run_test check_path omit-no-ref.test.dtb exists "/node3"
> run_test check_path omit-no-ref.test.dtb exists "/node4"
>
> - run_dtc_test -I dts -O dts -o delete_reinstate_multilabel.dts.test.dts delete_reinstate_multilabel.dts
> - run_wrap_test cmp delete_reinstate_multilabel.dts.test.dts delete_reinstate_multilabel_ref.dts
> + run_dtc_test -I dts -O dts -o delete_reinstate_multilabel.dts.test.dts "$SRCDIR/delete_reinstate_multilabel.dts"
> + run_wrap_test cmp delete_reinstate_multilabel.dts.test.dts "$SRCDIR/delete_reinstate_multilabel_ref.dts"
>
> # Check some checks
> - check_tests dup-nodename.dts duplicate_node_names
> - check_tests dup-propname.dts duplicate_property_names
> - check_tests dup-phandle.dts explicit_phandles
> - check_tests zero-phandle.dts explicit_phandles
> - check_tests minusone-phandle.dts explicit_phandles
> - run_sh_test dtc-checkfails.sh phandle_references -- -I dts -O dtb nonexist-node-ref.dts
> - run_sh_test dtc-checkfails.sh phandle_references -- -I dts -O dtb nonexist-label-ref.dts
> - run_sh_test dtc-fatal.sh -I dts -O dtb nonexist-node-ref2.dts
> - check_tests bad-name-property.dts name_properties
> -
> - check_tests bad-ncells.dts address_cells_is_cell size_cells_is_cell interrupt_cells_is_cell
> - check_tests bad-string-props.dts device_type_is_string model_is_string status_is_string label_is_string compatible_is_string_list names_is_string_list
> - check_tests bad-chosen.dts chosen_node_is_root
> - check_tests bad-chosen.dts chosen_node_bootargs
> - check_tests bad-chosen.dts chosen_node_stdout_path
> - check_tests bad-reg-ranges.dts reg_format ranges_format
> - check_tests bad-empty-ranges.dts ranges_format
> - check_tests reg-ranges-root.dts reg_format ranges_format
> - check_tests default-addr-size.dts avoid_default_addr_size
> - check_tests obsolete-chosen-interrupt-controller.dts obsolete_chosen_interrupt_controller
> - check_tests reg-without-unit-addr.dts unit_address_vs_reg
> - check_tests unit-addr-without-reg.dts unit_address_vs_reg
> - check_tests unit-addr-leading-0x.dts unit_address_format
> - check_tests unit-addr-leading-0s.dts unit_address_format
> - check_tests unit-addr-unique.dts unique_unit_address
> - check_tests bad-phandle-cells.dts interrupts_extended_property
> - check_tests bad-gpio.dts gpios_property
> - check_tests bad-graph.dts graph_child_address
> - check_tests bad-graph.dts graph_port
> - check_tests bad-graph.dts graph_endpoint
> - run_sh_test dtc-checkfails.sh deprecated_gpio_property -- -Wdeprecated_gpio_property -I dts -O dtb bad-gpio.dts
> - check_tests bad-interrupt-cells.dts interrupts_property
> - run_sh_test dtc-checkfails.sh node_name_chars -- -I dtb -O dtb bad_node_char.dtb
> - run_sh_test dtc-checkfails.sh node_name_format -- -I dtb -O dtb bad_node_format.dtb
> - run_sh_test dtc-checkfails.sh property_name_chars -- -I dtb -O dtb bad_prop_char.dtb
> -
> - run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label1.dts
> - run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label2.dts
> - run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label3.dts
> - run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label4.dts
> - run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label5.dts
> - run_sh_test dtc-checkfails.sh duplicate_label -- -I dts -O dtb reuse-label6.dts
> + check_tests "$SRCDIR/dup-nodename.dts" duplicate_node_names
> + check_tests "$SRCDIR/dup-propname.dts" duplicate_property_names
> + check_tests "$SRCDIR/dup-phandle.dts" explicit_phandles
> + check_tests "$SRCDIR/zero-phandle.dts" explicit_phandles
> + check_tests "$SRCDIR/minusone-phandle.dts" explicit_phandles
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" phandle_references -- -I dts -O dtb "$SRCDIR/nonexist-node-ref.dts"
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" phandle_references -- -I dts -O dtb "$SRCDIR/nonexist-label-ref.dts"
> + run_sh_test "$SRCDIR/dtc-fatal.sh" -I dts -O dtb "$SRCDIR/nonexist-node-ref2.dts"
> + check_tests "$SRCDIR/bad-name-property.dts" name_properties
> +
> + check_tests "$SRCDIR/bad-ncells.dts" address_cells_is_cell size_cells_is_cell interrupt_cells_is_cell
> + check_tests "$SRCDIR/bad-string-props.dts" device_type_is_string model_is_string status_is_string label_is_string compatible_is_string_list names_is_string_list
> + check_tests "$SRCDIR/bad-chosen.dts" chosen_node_is_root
> + check_tests "$SRCDIR/bad-chosen.dts" chosen_node_bootargs
> + check_tests "$SRCDIR/bad-chosen.dts" chosen_node_stdout_path
> + check_tests "$SRCDIR/bad-reg-ranges.dts" reg_format ranges_format
> + check_tests "$SRCDIR/bad-empty-ranges.dts" ranges_format
> + check_tests "$SRCDIR/reg-ranges-root.dts" reg_format ranges_format
> + check_tests "$SRCDIR/default-addr-size.dts" avoid_default_addr_size
> + check_tests "$SRCDIR/obsolete-chosen-interrupt-controller.dts" obsolete_chosen_interrupt_controller
> + check_tests "$SRCDIR/reg-without-unit-addr.dts" unit_address_vs_reg
> + check_tests "$SRCDIR/unit-addr-without-reg.dts" unit_address_vs_reg
> + check_tests "$SRCDIR/unit-addr-leading-0x.dts" unit_address_format
> + check_tests "$SRCDIR/unit-addr-leading-0s.dts" unit_address_format
> + check_tests "$SRCDIR/unit-addr-unique.dts" unique_unit_address
> + check_tests "$SRCDIR/bad-phandle-cells.dts" interrupts_extended_property
> + check_tests "$SRCDIR/bad-gpio.dts" gpios_property
> + check_tests "$SRCDIR/bad-graph.dts" graph_child_address
> + check_tests "$SRCDIR/bad-graph.dts" graph_port
> + check_tests "$SRCDIR/bad-graph.dts" graph_endpoint
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" deprecated_gpio_property -- -Wdeprecated_gpio_property -I dts -O dtb "$SRCDIR/bad-gpio.dts"
> + check_tests "$SRCDIR/bad-interrupt-cells.dts" interrupts_property
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" node_name_chars -- -I dtb -O dtb bad_node_char.dtb
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" node_name_format -- -I dtb -O dtb bad_node_format.dtb
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" property_name_chars -- -I dtb -O dtb bad_prop_char.dtb
> +
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" duplicate_label -- -I dts -O dtb "$SRCDIR/reuse-label1.dts"
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" duplicate_label -- -I dts -O dtb "$SRCDIR/reuse-label2.dts"
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" duplicate_label -- -I dts -O dtb "$SRCDIR/reuse-label3.dts"
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" duplicate_label -- -I dts -O dtb "$SRCDIR/reuse-label4.dts"
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" duplicate_label -- -I dts -O dtb "$SRCDIR/reuse-label5.dts"
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" duplicate_label -- -I dts -O dtb "$SRCDIR/reuse-label6.dts"
>
> run_test check_path test_tree1.dtb exists "/subnode@1"
> run_test check_path test_tree1.dtb not-exists "/subnode@10"
>
> - check_tests pci-bridge-ok.dts -n pci_bridge
> - check_tests pci-bridge-bad1.dts pci_bridge
> - check_tests pci-bridge-bad2.dts pci_bridge
> + check_tests "$SRCDIR/pci-bridge-ok.dts" -n pci_bridge
> + check_tests "$SRCDIR/pci-bridge-bad1.dts" pci_bridge
> + check_tests "$SRCDIR/pci-bridge-bad2.dts" pci_bridge
>
> - check_tests unit-addr-simple-bus-reg-mismatch.dts simple_bus_reg
> - check_tests unit-addr-simple-bus-compatible.dts simple_bus_reg
> + check_tests "$SRCDIR/unit-addr-simple-bus-reg-mismatch.dts" simple_bus_reg
> + check_tests "$SRCDIR/unit-addr-simple-bus-compatible.dts" simple_bus_reg
>
>
> # Check warning options
> - run_sh_test dtc-checkfails.sh address_cells_is_cell interrupt_cells_is_cell -n size_cells_is_cell -- -Wno_size_cells_is_cell -I dts -O dtb bad-ncells.dts
> - run_sh_test dtc-fails.sh -n test-warn-output.test.dtb -I dts -O dtb bad-ncells.dts
> - run_sh_test dtc-fails.sh test-error-output.test.dtb -I dts -O dtb bad-ncells.dts -Esize_cells_is_cell
> - run_sh_test dtc-checkfails.sh always_fail -- -Walways_fail -I dts -O dtb test_tree1.dts
> - run_sh_test dtc-checkfails.sh -n always_fail -- -Walways_fail -Wno_always_fail -I dts -O dtb test_tree1.dts
> - run_sh_test dtc-fails.sh test-negation-1.test.dtb -Ealways_fail -I dts -O dtb test_tree1.dts
> - run_sh_test dtc-fails.sh -n test-negation-2.test.dtb -Ealways_fail -Eno_always_fail -I dts -O dtb test_tree1.dts
> - run_sh_test dtc-fails.sh test-negation-3.test.dtb -Ealways_fail -Wno_always_fail -I dts -O dtb test_tree1.dts
> - run_sh_test dtc-fails.sh -n test-negation-4.test.dtb -Esize_cells_is_cell -Eno_size_cells_is_cell -I dts -O dtb bad-ncells.dts
> - run_sh_test dtc-checkfails.sh size_cells_is_cell -- -Esize_cells_is_cell -Eno_size_cells_is_cell -I dts -O dtb bad-ncells.dts
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" address_cells_is_cell interrupt_cells_is_cell -n size_cells_is_cell -- -Wno_size_cells_is_cell -I dts -O dtb "$SRCDIR/bad-ncells.dts"
> + run_sh_test "$SRCDIR/dtc-fails.sh" -n test-warn-output.test.dtb -I dts -O dtb "$SRCDIR/bad-ncells.dts"
> + run_sh_test "$SRCDIR/dtc-fails.sh" test-error-output.test.dtb -I dts -O dtb bad-ncells.dts -Esize_cells_is_cell
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" always_fail -- -Walways_fail -I dts -O dtb "$SRCDIR/test_tree1.dts"
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" -n always_fail -- -Walways_fail -Wno_always_fail -I dts -O dtb "$SRCDIR/test_tree1.dts"
> + run_sh_test "$SRCDIR/dtc-fails.sh" test-negation-1.test.dtb -Ealways_fail -I dts -O dtb "$SRCDIR/test_tree1.dts"
> + run_sh_test "$SRCDIR/dtc-fails.sh" -n test-negation-2.test.dtb -Ealways_fail -Eno_always_fail -I dts -O dtb "$SRCDIR/test_tree1.dts"
> + run_sh_test "$SRCDIR/dtc-fails.sh" test-negation-3.test.dtb -Ealways_fail -Wno_always_fail -I dts -O dtb "$SRCDIR/test_tree1.dts"
> + run_sh_test "$SRCDIR/dtc-fails.sh" -n test-negation-4.test.dtb -Esize_cells_is_cell -Eno_size_cells_is_cell -I dts -O dtb "$SRCDIR/bad-ncells.dts"
> + run_sh_test "$SRCDIR/dtc-checkfails.sh" size_cells_is_cell -- -Esize_cells_is_cell -Eno_size_cells_is_cell -I dts -O dtb "$SRCDIR/bad-ncells.dts"
>
> # Check for proper behaviour reading from stdin
> - run_dtc_test -I dts -O dtb -o stdin_dtc_tree1.test.dtb - < test_tree1.dts
> + run_dtc_test -I dts -O dtb -o stdin_dtc_tree1.test.dtb - < "$SRCDIR/test_tree1.dts"
> run_wrap_test cmp stdin_dtc_tree1.test.dtb dtc_tree1.test.dtb
> run_dtc_test -I dtb -O dts -o stdin_odts_test_tree1.dtb.test.dts - < test_tree1.dtb
> run_wrap_test cmp stdin_odts_test_tree1.dtb.test.dts odts_test_tree1.dtb.test.dts
> @@ -723,32 +724,33 @@ dtc_tests () {
> run_test integer-expressions integer-expressions.test.dtb
>
> # Check for graceful failure in some error conditions
> - run_sh_test dtc-fatal.sh -I dts -O dtb nosuchfile.dts
> - run_sh_test dtc-fatal.sh -I dtb -O dtb nosuchfile.dtb
> - run_sh_test dtc-fatal.sh -I fs -O dtb nosuchfile
> + run_sh_test "$SRCDIR/dtc-fatal.sh" -I dts -O dtb nosuchfile.dts
> + run_sh_test "$SRCDIR/dtc-fatal.sh" -I dtb -O dtb nosuchfile.dtb
> + run_sh_test "$SRCDIR/dtc-fatal.sh" -I fs -O dtb nosuchfile
>
> # Dependencies
> - run_dtc_test -I dts -O dtb -o dependencies.test.dtb -d dependencies.test.d dependencies.dts
> - run_wrap_test cmp dependencies.test.d dependencies.cmp
> + run_dtc_test -I dts -O dtb -o dependencies.test.dtb -d dependencies.test.d "$SRCDIR/dependencies.dts"
> + sed -i "s,$SRCDIR/,,g" dependencies.test.d
> + run_wrap_test cmp dependencies.test.d "$SRCDIR/dependencies.cmp"
>
> # Search paths
> - run_wrap_error_test $DTC -I dts -O dtb -o search_paths.dtb search_paths.dts
> - run_dtc_test -i search_dir -I dts -O dtb -o search_paths.dtb \
> - search_paths.dts
> - run_wrap_error_test $DTC -i search_dir_b -I dts -O dtb \
> - -o search_paths_b.dtb search_paths_b.dts
> - run_dtc_test -i search_dir_b -i search_dir -I dts -O dtb \
> - -o search_paths_b.dtb search_paths_b.dts
> + run_wrap_error_test $DTC -I dts -O dtb -o search_paths.dtb "$SRCDIR/search_paths.dts"
> + run_dtc_test -i "$SRCDIR/search_dir" -I dts -O dtb -o search_paths.dtb \
> + "$SRCDIR/search_paths.dts"
> + run_wrap_error_test $DTC -i "$SRCDIR/search_dir_b" -I dts -O dtb \
> + -o search_paths_b.dtb "$SRCDIR/search_paths_b.dts"
> + run_dtc_test -i "$SRCDIR/search_dir_b" -i "$SRCDIR/search_dir" -I dts -O dtb \
> + -o search_paths_b.dtb "$SRCDIR/search_paths_b.dts"
> run_dtc_test -I dts -O dtb -o search_paths_subdir.dtb \
> - search_dir_b/search_paths_subdir.dts
> + "$SRCDIR/search_dir_b/search_paths_subdir.dts"
>
> # Check -a option
> for align in 2 4 8 16 32 64; do
> # -p -a
> - run_dtc_test -O dtb -p 1000 -a $align -o align0.dtb subnode_iterate.dts
> + run_dtc_test -O dtb -p 1000 -a $align -o align0.dtb "$SRCDIR/subnode_iterate.dts"
> base_run_test check_align align0.dtb $align
> # -S -a
> - run_dtc_test -O dtb -S 1999 -a $align -o align1.dtb subnode_iterate.dts
> + run_dtc_test -O dtb -S 1999 -a $align -o align1.dtb "$SRCDIR/subnode_iterate.dts"
> base_run_test check_align align1.dtb $align
> done
>
> @@ -789,7 +791,7 @@ cmp_tests () {
> dtbs_equal_tests () {
> WRONG_TREE1=""
> for x in 1 2 3 4 5 6 7 8 9; do
> - run_dtc_test -I dts -O dtb -o test_tree1_wrong$x.test.dtb test_tree1_wrong$x.dts
> + run_dtc_test -I dts -O dtb -o test_tree1_wrong$x.test.dtb "$SRCDIR/test_tree1_wrong$x.dts"
> WRONG_TREE1="$WRONG_TREE1 test_tree1_wrong$x.test.dtb"
> done
> cmp_tests test_tree1.dtb $WRONG_TREE1
> @@ -798,7 +800,7 @@ dtbs_equal_tests () {
> fdtget_tests () {
> dts=label01.dts
> dtb=$dts.fdtget.test.dtb
> - run_dtc_test -O dtb -o $dtb $dts
> + run_dtc_test -O dtb -o $dtb "$SRCDIR/$dts"
>
> # run_fdtget_test <expected-result> [<flags>] <file> <node> <property>
> run_fdtget_test "MyBoardName" $dtb / model
> @@ -832,10 +834,10 @@ fdtget_tests () {
> fdtput_tests () {
> dts=label01.dts
> dtb=$dts.fdtput.test.dtb
> - text=lorem.txt
> + text="$SRCDIR/lorem.txt"
>
> # Allow just enough space for $text
> - run_dtc_test -O dtb -p $($STATSZ $text) -o $dtb $dts
> + run_dtc_test -O dtb -p $($STATSZ $text) -o $dtb "$SRCDIR/$dts"
>
> # run_fdtput_test <expected-result> <file> <node> <property> <flags> <value>
> run_fdtput_test "a_model" $dtb / model -ts "a_model"
> @@ -854,7 +856,7 @@ fdtput_tests () {
> run_fdtput_test "$(cat $text $text)" $dtb /randomnode blob -ts "$(cat $text $text)"
>
> # Start again with a fresh dtb
> - run_dtc_test -O dtb -p $($STATSZ $text) -o $dtb $dts
> + run_dtc_test -O dtb -p $($STATSZ $text) -o $dtb "$SRCDIR/$dts"
>
> # Node creation
> run_wrap_error_test $DTPUT $dtb -c /baldrick sod
> @@ -882,7 +884,7 @@ fdtput_tests () {
> run_wrap_test $DTPUT $dtb -cp /chosen/son
>
> # Start again with a fresh dtb
> - run_dtc_test -O dtb -p $($STATSZ $text) -o $dtb $dts
> + run_dtc_test -O dtb -p $($STATSZ $text) -o $dtb "$SRCDIR/$dts"
>
> # Node delete
> run_wrap_test $DTPUT $dtb -c /chosen/node1 /chosen/node2 /chosen/node3
> @@ -911,13 +913,13 @@ utilfdt_tests () {
> }
>
> fdtdump_tests () {
> - run_fdtdump_test fdtdump.dts
> + run_fdtdump_test "$SRCDIR/fdtdump.dts"
> }
>
> fdtoverlay_tests() {
> - base=overlay_base.dts
> + base="$SRCDIR/overlay_base.dts"
> basedtb=overlay_base.fdoverlay.test.dtb
> - overlay=overlay_overlay_manual_fixups.dts
> + overlay="$SRCDIR/overlay_overlay_manual_fixups.dts"
> overlaydtb=overlay_overlay_manual_fixups.fdoverlay.test.dtb
> targetdtb=target.fdoverlay.test.dtb
>
> @@ -927,11 +929,11 @@ fdtoverlay_tests() {
> # test that the new property is installed
> run_fdtoverlay_test foobar "/test-node" "test-str-property" "-ts" ${basedtb} ${targetdtb} ${overlaydtb}
>
> - stacked_base=stacked_overlay_base.dts
> + stacked_base="$SRCDIR/stacked_overlay_base.dts"
> stacked_basedtb=stacked_overlay_base.fdtoverlay.test.dtb
> - stacked_bar=stacked_overlay_bar.dts
> + stacked_bar="$SRCDIR/stacked_overlay_bar.dts"
> stacked_bardtb=stacked_overlay_bar.fdtoverlay.test.dtb
> - stacked_baz=stacked_overlay_baz.dts
> + stacked_baz="$SRCDIR/stacked_overlay_baz.dts"
> stacked_bazdtb=stacked_overlay_baz.fdtoverlay.test.dtb
> stacked_targetdtb=stacked_overlay_target.fdtoverlay.test.dtb
>
> @@ -942,7 +944,7 @@ fdtoverlay_tests() {
> # test that baz correctly inserted the property
> run_fdtoverlay_test baz "/foonode/barnode/baznode" "baz-property" "-ts" ${stacked_basedtb} ${stacked_targetdtb} ${stacked_bardtb} ${stacked_bazdtb}
>
> - overlay_long_path=overlay_overlay_long_path.dts
> + overlay_long_path="$SRCDIR/overlay_overlay_long_path.dts"
> overlay_long_pathdtb=overlay_overlay_long_path.fdoverlay.test.dtb
> target_long_pathdtb=overlay_overlay_long_path_target.fdoverlay.test.dtb
> run_dtc_test -@ -I dts -O dtb -o $overlay_long_pathdtb $overlay_long_path
> @@ -951,9 +953,9 @@ fdtoverlay_tests() {
> run_fdtoverlay_test lpath "/test-node/sub-test-node/sub-test-node-with-very-long-target-path/test-0" "prop" "-ts" ${basedtb} ${target_long_pathdtb} ${overlay_long_pathdtb}
>
> # test adding a label to the root of a fragment
> - stacked_base_nolabel=stacked_overlay_base_nolabel.dts
> + stacked_base_nolabel="$SRCDIR/stacked_overlay_base_nolabel.dts"
> stacked_base_nolabeldtb=stacked_overlay_base_nolabel.test.dtb
> - stacked_addlabel=stacked_overlay_addlabel.dts
> + stacked_addlabel="$SRCDIR/stacked_overlay_addlabel.dts"
> stacked_addlabeldtb=stacked_overlay_addlabel.test.dtb
> stacked_addlabel_targetdtb=stacked_overlay_target_nolabel.fdtoverlay.test.dtb
>
> @@ -964,9 +966,9 @@ fdtoverlay_tests() {
> }
>
> pylibfdt_tests () {
> - run_dtc_test -I dts -O dtb -o test_props.dtb test_props.dts
> + run_dtc_test -I dts -O dtb -o test_props.dtb "$SRCDIR/test_props.dts"
> TMP=/tmp/tests.stderr.$$
> - $PYTHON pylibfdt_tests.py -v 2> $TMP
> + $PYTHON "$SRCDIR/pylibfdt_tests.py" -v 2> $TMP
>
> # Use the 'ok' message meaning the test passed, 'ERROR' meaning it failed
> # and the summary line for total tests (e.g. 'Ran 17 tests in 0.002s').
--
David Gibson | I'll have my music baroque, and my code
david AT gibson.dropbear.id.au | minimalist, thank you. NOT _the_ _other_
| _way_ _around_!
http://www.ozlabs.org/~dgibson
Attachment:
signature.asc
Description: PGP signature
