Revision 208b02e3

b/Makefile.am
793 793
	autotools/check-version \
794 794
	autotools/convert-constants \
795 795
	autotools/docpp \
796
	autotools/gen-coverage \
796
	autotools/gen-py-coverage \
797 797
	autotools/testrunner \
798 798
	autotools/wrong-hardcoded-paths \
799 799
	$(RUN_IN_TEMPDIR) \
......
1770 1770
	COVERAGE_FILE=$(CURDIR)/$(COVERAGE_PY_DIR)/data \
1771 1771
	TEXT_COVERAGE=$(CURDIR)/$(COVERAGE_PY_DIR)/report.txt \
1772 1772
	HTML_COVERAGE=$(CURDIR)/$(COVERAGE_PY_DIR) \
1773
	$(PLAIN_TESTS_ENVIRONMENT) $(abs_top_srcdir)/autotools/gen-coverage \
1773
	$(PLAIN_TESTS_ENVIRONMENT) \
1774
	$(abs_top_srcdir)/autotools/gen-py-coverage \
1774 1775
	$(python_tests)
1775 1776

  
1776 1777
.PHONY: hs-coverage
......
1779 1780
	$(MAKE) $(AM_MAKEFLAGS) hs-check
1780 1781
	@mkdir_p@ $(COVERAGE_HS_DIR)
1781 1782
	hpc sum --union $(HPCEXCL) \
1782
	  htest.tix hpc-htools.tix hpc-mon-collector.tix > coverage-htools.tix
1783
	hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-htools.tix
1784
	hpc report coverage-htools.tix
1783
	  htest.tix hpc-htools.tix hpc-mon-collector.tix > coverage-hs.tix
1784
	hpc markup --destdir=$(COVERAGE_HS_DIR) coverage-hs.tix
1785
	hpc report coverage-hs.tix
1785 1786
	$(LN_S) -f hpc_index.html $(COVERAGE_HS_DIR)/index.html
1786 1787

  
1787 1788
# Special "kind-of-QA" target for htools, needs special setup (all
/dev/null
1
#!/bin/bash
2
#
3

  
4
# Copyright (C) 2010, 2011, 2012 Google Inc.
5
#
6
# This program is free software; you can redistribute it and/or modify
7
# it under the terms of the GNU General Public License as published by
8
# the Free Software Foundation; either version 2 of the License, or
9
# (at your option) any later version.
10
#
11
# This program is distributed in the hope that it will be useful, but
12
# WITHOUT ANY WARRANTY; without even the implied warranty of
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
# General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License
17
# along with this program; if not, write to the Free Software
18
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
19
# 02110-1301, USA.
20

  
21
set -e
22
set -u
23

  
24
: ${PYTHON:=python}
25
: ${COVERAGE:?}
26
: ${COVERAGE_FILE:?}
27
: ${TEXT_COVERAGE:?}
28
: ${HTML_COVERAGE:=}
29
: ${GANETI_TEMP_DIR:?}
30

  
31
reportargs=(
32
  '--include=*'
33
  '--omit=test/py/*'
34
  )
35

  
36
$COVERAGE erase
37

  
38
if [[ -n "$HTML_COVERAGE" ]]; then
39
  if [[ ! -d "$HTML_COVERAGE" ]]; then
40
    echo "Not a directory: $HTML_COVERAGE" >&2
41
    exit 1
42
  fi
43

  
44
  # At least coverage 3.4 fails to overwrite files
45
  find "$HTML_COVERAGE" \( -type f -o -type l \) -delete
46
fi
47

  
48
for script; do
49
  if [[ "$script" == *-runasroot.py ]]; then
50
    if [[ -z "$FAKEROOT" ]]; then
51
      echo "WARNING: FAKEROOT variable not set: skipping $script" >&2
52
      continue
53
    fi
54
    cmdprefix="$FAKEROOT"
55
  else
56
    cmdprefix=
57
  fi
58
  $cmdprefix $COVERAGE run --branch --append "${reportargs[@]}" $script
59
done
60

  
61
echo "Writing text report to $TEXT_COVERAGE ..." >&2
62
$COVERAGE report "${reportargs[@]}" | tee "$TEXT_COVERAGE"
63

  
64
if [[ -n "$HTML_COVERAGE" ]]; then
65
  echo "Generating HTML report in $HTML_COVERAGE ..." >&2
66
  $COVERAGE html "${reportargs[@]}" -d "$HTML_COVERAGE"
67
fi
b/autotools/gen-py-coverage
1
#!/bin/bash
2
#
3

  
4
# Copyright (C) 2010, 2011, 2012 Google Inc.
5
#
6
# This program is free software; you can redistribute it and/or modify
7
# it under the terms of the GNU General Public License as published by
8
# the Free Software Foundation; either version 2 of the License, or
9
# (at your option) any later version.
10
#
11
# This program is distributed in the hope that it will be useful, but
12
# WITHOUT ANY WARRANTY; without even the implied warranty of
13
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
14
# General Public License for more details.
15
#
16
# You should have received a copy of the GNU General Public License
17
# along with this program; if not, write to the Free Software
18
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
19
# 02110-1301, USA.
20

  
21
set -e
22
set -u
23

  
24
: ${PYTHON:=python}
25
: ${COVERAGE:?}
26
: ${COVERAGE_FILE:?}
27
: ${TEXT_COVERAGE:?}
28
: ${HTML_COVERAGE:=}
29
: ${GANETI_TEMP_DIR:?}
30

  
31
reportargs=(
32
  '--include=*'
33
  '--omit=test/py/*'
34
  )
35

  
36
$COVERAGE erase
37

  
38
if [[ -n "$HTML_COVERAGE" ]]; then
39
  if [[ ! -d "$HTML_COVERAGE" ]]; then
40
    echo "Not a directory: $HTML_COVERAGE" >&2
41
    exit 1
42
  fi
43

  
44
  # At least coverage 3.4 fails to overwrite files
45
  find "$HTML_COVERAGE" \( -type f -o -type l \) -delete
46
fi
47

  
48
for script; do
49
  if [[ "$script" == *-runasroot.py ]]; then
50
    if [[ -z "$FAKEROOT" ]]; then
51
      echo "WARNING: FAKEROOT variable not set: skipping $script" >&2
52
      continue
53
    fi
54
    cmdprefix="$FAKEROOT"
55
  else
56
    cmdprefix=
57
  fi
58
  $cmdprefix $COVERAGE run --branch --append "${reportargs[@]}" $script
59
done
60

  
61
echo "Writing text report to $TEXT_COVERAGE ..." >&2
62
$COVERAGE report "${reportargs[@]}" | tee "$TEXT_COVERAGE"
63

  
64
if [[ -n "$HTML_COVERAGE" ]]; then
65
  echo "Generating HTML report in $HTML_COVERAGE ..." >&2
66
  $COVERAGE html "${reportargs[@]}" -d "$HTML_COVERAGE"
67
fi

Also available in: Unified diff