diff options
| author | Emmanuele Bassi <ebassi@linux.intel.com> | 2010-10-12 16:05:26 +0100 |
|---|---|---|
| committer | Emmanuele Bassi <ebassi@linux.intel.com> | 2010-12-28 16:35:14 +0000 |
| commit | 500061f67567477c70b7950a60b0d5620a74131a (patch) | |
| tree | 45f1067c4e83bae78d3db2feb860f9921bb3565e /Makefile.decl | |
| parent | 52c831099e5fed55482c3d8cf43b457e37843bd6 (diff) | |
test: Add a <revision> node to the report XML
Use `git describe` to fill out the <revision> node, if we're using a
git checkout; otherwise, for tests ran from a released tarball, use
the version.
https://bugzilla.gnome.org/show_bug.cgi?id=631980
Diffstat (limited to 'Makefile.decl')
| -rw-r--r-- | Makefile.decl | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/Makefile.decl b/Makefile.decl index d07e6d23f..163fd8bbf 100644 --- a/Makefile.decl +++ b/Makefile.decl @@ -46,17 +46,23 @@ test-report perf-report full-report: ${TEST_PROGS} GTESTER_LOGDIR=`mktemp -d "\`pwd\`/.testlogs-XXXXXX"`; export GTESTER_LOGDIR ; \ ignore_logdir=false ; \ fi ; \ + if test -d "$(top_srcdir)/.git" ; then \ + REVISION=`git describe` ; \ + else \ + REVISION=$(VERSION) ; \ + fi ; \ for subdir in $(SUBDIRS) . ; do \ test "$$subdir" = "." -o "$$subdir" = "po" || \ ( cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $@ ) || exit $? ; \ done ; \ $$ignore_logdir || { \ - echo '<?xml version="1.0"?>' > $@.xml ; \ - echo '<report-collection>' >> $@.xml ; \ - echo '<info>' >> $@.xml ; \ - echo ' <package>$(PACKAGE)</package>' >> $@.xml ; \ - echo ' <version>$(VERSION)</version>' >> $@.xml ; \ - echo '</info>' >> $@.xml ; \ + echo '<?xml version="1.0"?>' > $@.xml ; \ + echo '<report-collection>' >> $@.xml ; \ + echo '<info>' >> $@.xml ; \ + echo ' <package>$(PACKAGE)</package>' >> $@.xml ; \ + echo ' <version>$(VERSION)</version>' >> $@.xml ; \ + echo " <revision>$$REVISION</revision>" >> $@.xml ; \ + echo '</info>' >> $@.xml ; \ for lf in `ls -L "$$GTESTER_LOGDIR"/.` ; do \ sed '1,1s/^<?xml\b[^>?]*?>//' <"$$GTESTER_LOGDIR"/"$$lf" >> $@.xml ; \ done ; \ |