Change scripts to adjust to SPECjbb versions

Not quite sure we need to tolerate specjbb2013 and specjbb2015.
This adjusts output to version of SPECJBB we're running against.

3 files changed, 9 insertions, 4 deletions

diff --git a/common.sh b/common.sh
index b56d19a..ef71e39 100644
--- a/common.sh
+++ b/common.sh
@@ -31,4 +31,8 @@ set -a
 : ${SERVER_CRITICAL_JOPS_BASELINE:=1}
 : ${PUBLISH_HOST:=stuart.monteith@people.linaro.org}
 
+# Extract year from SPECJBB name.
+[[ $(basename $SPECJBB_PRODUCT_HOME) =~ SPECjbb([0-9]*).* ]]
+SPECJBB_PRODUCT_YEAR=${BASH_REMATCH[1]}
+
 set +a
diff --git a/print-historic-results.py b/print-historic-results.py
index 82046e9..d83b6a8 100755
--- a/print-historic-results.py
+++ b/print-historic-results.py
@@ -37,6 +37,7 @@ if not os.path.exists(sys.argv[1]):
 server_max_jops_baseline = os.getenv('SERVER_MAX_JOPS_BASELINE', 1)
 server_critical_jops_baseline = os.getenv('SERVER_CRITICAL_JOPS_BASELINE', 1)
 title = os.path.basename(os.getenv("SPECJBB_PRODUCT_HOME"))
+year = os.getenv("SPECJBB_PRODUCT_YEAR")
 
 head = HEAD(TITLE("{} Result Archive ({})".format(title, platform.machine())))
 head <= LINK(rel="stylesheet", href="style.css")
@@ -53,7 +54,7 @@ In accordance with {}, the tests are run on a system which is not
 production ready and does not meet all the requirements for publishing
 compliant results. The numbers below shall be treated
 as non-compliant (nc) and are for experimental purposes only.
-""".format(A("SPECjbb2013", href="http://www.spec.org/jbb2013/"),
+""".format(A("SPECjbb%s" % year, href="http://www.spec.org/jbb%s/" % year),
            os.getenv('BASEDATE'),
            A("[1]", href="#footnote-1")))
 
diff --git a/specjbb-report b/specjbb-report
index d503990..521e2c3 100755
--- a/specjbb-report
+++ b/specjbb-report
@@ -31,15 +31,15 @@ y=$(printf "%.2f" $(echo "scale=10; $server_critical_jops_today / 1.0" | bc))
 
 people_link="http://openjdk.linaro.org/jdk${JDK_VERSION}/$(basename $(dirname $RESULTS_CSV))/"
 
-echo "SPECjbb2013 composite regression test completed"
+echo "SPECjbb${SPECJBB_PRODUCT_YEAR} composite regression test completed"
 echo "==============================================="
 echo ""
 echo "This test measures the relative performance of the server"
-echo "compiler running the SPECjbb2013 composite tests and compares"
+echo "compiler running the SPECjbb${SPECJBB_PRODUCT_YEAR} composite tests and compares"
 echo "the performance against the baseline performance of the server"
 echo "compiler taken on $BASEDATE."
 echo ""
-echo "In accordance with [1], the SPECjbb2013 tests are run on a system"
+echo "In accordance with [1], the SPECjbb${SPECJBB_PRODUCT_YEAR} tests are run on a system"
 echo "which is not production ready and does not meet all the"
 echo "requirements for publishing compliant results. The numbers below"
 echo "shall be treated as non-compliant (nc) and are for experimental"