commit 855c934e26aeadb5bab878d1b148090af2480c90
author Brandon Maier <brandon.maier@collins.com> Wed Mar 20 21:59:56 2024 +0000
committer David Gibson <david@gibson.dropbear.id.au> Fri Mar 22 08:56:12 2024 +1100
tree 79e797bbedce347119868a56718f3f837bb68799
parent 4fd3f4f0a95d04944271e9482b111de6e3bb7124

tests: fix tests broken under Meson

Tests running under Meson run from a different working directory then
under Makefile. Some of these tests had not been fixed to work from a
different directory because the tests were testing for an error
condition which is indistinguishable from a missing file.

Signed-off-by: Brandon Maier <brandon.maier@collins.com>
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>

tests/run_tests.sh

diff --git a/tests/run_tests.sh b/tests/run_tests.sh
index f13cdb2..462f2ca 100755
--- a/tests/run_tests.sh
+++ b/tests/run_tests.sh
@@ -271,7 +271,7 @@
 	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
-    run_sh_test "$SRCDIR/dtc-fatal.sh" -I dts -O dtb -o /dev/null fixup-ref-to-path.dts
+    run_sh_test "$SRCDIR/dtc-fatal.sh" -I dts -O dtb -o /dev/null "$SRCDIR/fixup-ref-to-path.dts"
 }
 
 # Tests to exercise dtc's overlay generation support
@@ -497,13 +497,13 @@
 
     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_wrap_error_test $DTC "$SRCDIR/division-by-zero.dts"
+    run_wrap_error_test $DTC "$SRCDIR/bad-octal-literal.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
+    run_wrap_error_test $DTC "$SRCDIR/nul-in-line-info1.dts"
+    run_wrap_error_test $DTC "$SRCDIR/nul-in-line-info2.dts"
 
-    run_wrap_error_test $DTC -I dtb -O dts -o /dev/null ovf_size_strings.dtb
+    run_wrap_error_test $DTC -I dtb -O dts -o /dev/null "$SRCDIR/ovf_size_strings.dtb"
 
     run_test check_header test_tree1.dtb
 
@@ -774,7 +774,7 @@
     # Check warning options
     run_sh_test "$SRCDIR/dtc-checkfails.sh" address_cells_is_cell interrupts_extended_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-fails.sh" test-error-output.test.dtb -I dts -O dtb "$SRCDIR/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"