diff options
| author | David Gibson <david@gibson.dropbear.id.au> | 2012-02-03 16:12:08 +1100 |
|---|---|---|
| committer | Jon Loeliger <jdl@jdl.com> | 2012-02-03 08:41:23 -0600 |
| commit | c34e88354a07099dbc15a41621c81f71325d25fd (patch) | |
| tree | 25797eac796dd407a7660a14ab137c0b7c79c590 | |
| parent | 15b23d21a62b5a0295ee08b54d0842889ce94c92 (diff) | |
| download | dtc-c34e88354a07099dbc15a41621c81f71325d25fd.tar.gz | |
Don't use diff to check fdt{get,put} results
Currently the fdt{get,put}-runtest.sh scripts invoke diff to check if
fdt{get,put} did the right thing. This isn't great though: it's not
obvious from the diff output which is the expected and which is the
actual result; diff's line by line behaviour is useless here, since all
the results are a single line and finally, when there is a difference
it always prints information even when the tests are supposed to be
running in quiet mode.
This patch uses cmp instead, and explicitly prints the expected results,
when running in verbose mode (the invocation of fdtget itself will have
already displayed the actual results in this mode.
Signed-off-by: David Gibson <david@gibson.dropbear.id.au>
| -rwxr-xr-x | tests/fdtget-runtest.sh | 13 | ||||
| -rw-r--r-- | tests/fdtput-runtest.sh | 13 |
2 files changed, 14 insertions, 12 deletions
diff --git a/tests/fdtget-runtest.sh b/tests/fdtget-runtest.sh index 75e7503..dac7f9a 100755 --- a/tests/fdtget-runtest.sh +++ b/tests/fdtget-runtest.sh @@ -13,11 +13,12 @@ shift verbose_run_log_check "$LOG" $VALGRIND $DTGET "$@" -diff $EXPECT $LOG -ret="$?" - -if [ "$ret" -eq 0 ]; then - PASS +if cmp $EXPECT $LOG>/dev/null; then + PASS else - FAIL + if [ -z "$QUIET_TEST" ]; then + echo "EXPECTED :-:" + cat $EXPECT + fi + FAIL "Results differ from expected" fi diff --git a/tests/fdtput-runtest.sh b/tests/fdtput-runtest.sh index dbd9c0d..527a968 100644 --- a/tests/fdtput-runtest.sh +++ b/tests/fdtput-runtest.sh @@ -28,11 +28,12 @@ verbose_run_check $VALGRIND "$DTPUT" "$dtb" "$node" "$property" $value $flags # Now fdtget to read the value verbose_run_log_check "$LOG" $VALGRIND "$DTGET" "$dtb" "$node" "$property" $flags -diff $EXPECT $LOG -ret="$?" - -if [ "$ret" -eq 0 ]; then - PASS +if cmp $EXPECT $LOG >/dev/null; then + PASS else - FAIL + if [ -z "$QUIET_TEST" ]; then + echo "EXPECTED :-:" + cat $EXPECT + fi + FAIL "Results differ from expected" fi |