Skip to content

Commit

Permalink
tests: Honour NO_YAML make variable
Browse files Browse the repository at this point in the history
Support for YAML output in dtc is optional (to cover systems that don't
have libyaml).  Currently the tests for yaml output test if the libyaml
package is locally installed.

That duplicates similar logic in the Makefile, and worse it will cause
failed tests if the user explicitly disables YAML support, rather than
simply not having libyaml installed.

Fix this by having the test script use the NO_YAML variable exported by
make.  Fall back to the current test if the variable isn't set, such as
when running the script manually.

Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
  • Loading branch information
dgibson committed Mar 4, 2020
1 parent e4ce227 commit c5995dd
Showing 1 changed file with 15 additions and 1 deletion.
16 changes: 15 additions & 1 deletion tests/run_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,20 @@ else
fi
fi

if [ -n "$NO_YAML" ]; then
if [ "$NO_YAML" != "0" ]; then
no_yaml=true
else
no_yaml=false
fi
else
if pkg-config --exists yaml-0.1; then
no_yaml=false
else
no_yaml=true
fi
fi

# stat differs between platforms
if [ -z "$STATSZ" ]; then
stat --version 2>/dev/null | grep -q 'GNU'
Expand Down Expand Up @@ -615,7 +629,7 @@ dtc_tests () {
done

# Check -Oyaml output
if pkg-config --exists yaml-0.1; then
if ! $no_yaml; then
for tree in type-preservation; do
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
Expand Down

0 comments on commit c5995dd

Please sign in to comment.