diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-29 11:17:06 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2012-03-29 11:17:06 +0000 |
| commit | ccefd37a5855d7ec50e4e1a35efb707dd3936e67 (patch) | |
| tree | 7964985f44a6bdbfd7631f9c0f4ae2f7e51d9fed /tests.as-root | |
| parent | 610dcc00ccc888a72d7cda2d3d86f88b93b8e6e1 (diff) | |
| download | morph-ccefd37a5855d7ec50e4e1a35efb707dd3936e67.tar.gz | |
make patch test: discard tbdiff output
tbdiff can traverse the directory tree in an unsorted order, so two
equivalent patches can make changes in any order
This is a problem because tbdiff prints out the commands it ran,
so the output is not always the same. For now, we can just discard
this output, but ideally we want a --quiet option for tbdiff
Diffstat (limited to 'tests.as-root')
| -rwxr-xr-x | tests.as-root/make-patch.script | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tests.as-root/make-patch.script b/tests.as-root/make-patch.script index f7c34fcd..f6793aae 100755 --- a/tests.as-root/make-patch.script +++ b/tests.as-root/make-patch.script @@ -82,5 +82,5 @@ tests.as-root/morph make-patch "$PATCH" morphs-repo master hello-system.morph \ UNPACKED="$DATADIR"/unpacked mkdir -p "$UNPACKED" tar -C "$UNPACKED" -xf "$DATADIR"/farrokh-stratum -(cd "$UNPACKED" && tbdiff-deploy "$PATCH") +(cd "$UNPACKED" && tbdiff-deploy "$PATCH") 2>/dev/null "$UNPACKED"/bin/hello |