diff options
| author | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-07-31 13:25:50 +0000 |
|---|---|---|
| committer | Tiago Gomes <tiago.gomes@codethink.co.uk> | 2015-08-12 16:40:52 +0000 |
| commit | c5cb1b57cab30d089ad577f89a82e83a6d487d4f (patch) | |
| tree | 4ddca03b76217f32e4677e3b9af8871d9966fefa /tests.build | |
| parent | 2cf830f7df706cab0042481e772b1bd6f4f8ab8a (diff) | |
| download | morph-c5cb1b57cab30d089ad577f89a82e83a6d487d4f.tar.gz | |
Use the shell X-ray mode
Instead of logging every command for ourselves, use the shell X-ray
mode. As side effect, each command argument will now be printed out in
its evaluated form, which aids debugging.
Also, improve the visual separation between the different build steps,
and display those steps with finer granularity.
Change-Id: I16ebe9ba4ac46fef82e37d0b3e05f42d14249de8
Diffstat (limited to 'tests.build')
| -rw-r--r-- | tests.build/build-chunk-failures-dump-log.stdout | 10 | ||||
| -rwxr-xr-x | tests.build/prefix.script | 4 | ||||
| -rw-r--r-- | tests.build/prefix.stdout | 10 |
3 files changed, 13 insertions, 11 deletions
diff --git a/tests.build/build-chunk-failures-dump-log.stdout b/tests.build/build-chunk-failures-dump-log.stdout index 7a13c12a..83c67420 100644 --- a/tests.build/build-chunk-failures-dump-log.stdout +++ b/tests.build/build-chunk-failures-dump-log.stdout @@ -1,8 +1,8 @@ build failed -# configure -# # echo dummy configure +### CONFIGURE-COMMANDS ### ++ echo dummy configure dummy configure -# build -# # echo The next command will fail +### BUILD-COMMANDS ### ++ echo The next command will fail The next command will fail -# # false ++ false diff --git a/tests.build/prefix.script b/tests.build/prefix.script index 140617e1..662be704 100755 --- a/tests.build/prefix.script +++ b/tests.build/prefix.script @@ -34,7 +34,9 @@ name: plugh kind: chunk configure-commands: - "echo Second chunk: prefix $PREFIX" - - "echo Path: $(echo $PATH | grep -o '/plover')" + - | + set +x + echo Path: $(echo $PATH | grep -o '/plover') EOF git add xyzzy.morph diff --git a/tests.build/prefix.stdout b/tests.build/prefix.stdout index 80c18fae..cb953a4e 100644 --- a/tests.build/prefix.stdout +++ b/tests.build/prefix.stdout @@ -1,8 +1,8 @@ -# configure -# # echo First chunk: prefix $PREFIX +### CONFIGURE-COMMANDS ### ++ echo First chunk: prefix /plover First chunk: prefix /plover -# configure -# # echo Second chunk: prefix $PREFIX +### CONFIGURE-COMMANDS ### ++ echo Second chunk: prefix /usr Second chunk: prefix /usr -# # echo Path: $(echo $PATH | grep -o '/plover') ++ set +x Path: /plover |