diff --git a/cmd/package b/cmd/package index 39e0fffb3..b60f492ec 100755 --- a/cmd/package +++ b/cmd/package @@ -17,6 +17,7 @@ # Creates a package for Testrun MAKE_SRC_DIR=make +TESTRUN_VER="1-2-1-alpha" # Delete existing make files rm -rf $MAKE_SRC_DIR/usr @@ -56,4 +57,7 @@ cp -r {framework,modules} $MAKE_SRC_DIR/usr/local/testrun dpkg-deb --build --root-owner-group make # Rename the .deb file -mv make.deb testrun_1-2_amd64.deb +mv make.deb testrun_${TESTRUN_VER}_amd64.deb + +# Echo package version +echo Created installation package at testrun_${TESTRUN_VER}_amd64.deb diff --git a/framework/python/src/common/testreport.py b/framework/python/src/common/testreport.py index 4c33f71af..9b1eff6ef 100644 --- a/framework/python/src/common/testreport.py +++ b/framework/python/src/common/testreport.py @@ -57,7 +57,7 @@ def __init__(self, self._report_url = '' self._cur_page = 0 # Placeholder until available in json report - self._version = 'v1.2' + self._version = 'v1.2.1-alpha' def add_module_reports(self, module_reports): self._module_reports = module_reports @@ -356,6 +356,8 @@ def generate_result(self, result): result_class = 'result-test-result-non-compliant' elif result['result'] == 'Compliant': result_class = 'result-test-result-compliant' + elif result['result'] == 'Error': + result_class = 'result-test-result-error' else: result_class = 'result-test-result-skipped' @@ -857,10 +859,16 @@ def generate_css(self): max-width: 380px; } + .result-test-result-error { + background-color: #FCE8E6; + color: #C5221F; + left: 7.3in; + } + .result-test-result-non-compliant { background-color: #FCE8E6; color: #C5221F; - left: 7.02in; + left: 7.04in; } .result-test-result { @@ -882,7 +890,7 @@ def generate_css(self): .result-test-result-skipped { background-color: #e3e3e3; color: #393939; - left: 7.2in; + left: 7.22in; } /* CSS for the footer */ diff --git a/make/DEBIAN/control b/make/DEBIAN/control index df5f6d9fb..996f6e9d2 100644 --- a/make/DEBIAN/control +++ b/make/DEBIAN/control @@ -1,5 +1,5 @@ Package: Testrun -Version: 1.2 +Version: 1.2.1-alpha Architecture: amd64 Maintainer: Google Homepage: https://github.com/google/testrun