From 7586a065a767f33bc57c664306875f57bd5562b7 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Tue, 28 Apr 2020 14:57:08 -0400
Subject: Try to store ctest results

---
 .circleci/config.yml  | 8 ++++++++
 .circleci/test_spm.sh | 5 ++++-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 54b5d9e..c14ae58 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -6,6 +6,7 @@ jobs:
       - image: centos:7
 
     environment:
+      TEST_RESULTS: /tmp/test-results
       MALLOC_CHECK_: 1
 
     working_directory: ~/build
@@ -39,6 +40,9 @@ jobs:
           command: |
             .circleci/test_spm.sh
 
+      - store_test_results:
+          path: /tmp/test-reports
+
   build-macos:
     macos:
       xcode: 11.4.0
@@ -46,6 +50,7 @@ jobs:
     environment:
       HOMEBREW_NO_AUTO_UPDATE: 1
       DYLD_INSERT_LIBRARIES: /usr/lib/libgmalloc.dylib
+      TEST_RESULTS: /tmp/test-results
 
     steps:
       - checkout
@@ -70,6 +75,9 @@ jobs:
           command: |
             .circleci/test_spm.sh
 
+      - store_test_results:
+          path: /tmp/test-reports
+
 workflows:
   version: 2
   build-and-test:
diff --git a/.circleci/test_spm.sh b/.circleci/test_spm.sh
index eb141e5..fc52e04 100755
--- a/.circleci/test_spm.sh
+++ b/.circleci/test_spm.sh
@@ -1,13 +1,16 @@
 #!/bin/bash -e
 source $(dirname "${BASH_SOURCE[0]}")/runtime.sh
 
+export TEST_RESULTS=${TEST_RESULTS:-/tmp/test-results}
 export PREFIX=/tmp/root
 export SHELL=/bin/bash
+mkdir -p "${TEST_RESULTS}"
 cd build
 
 set -x
 
-ctest -V
+ctest -T test
+rsync -av Testing/*/*.xml "${TEST_RESULTS}"
 
 spm --list
 
-- 
cgit 


From 1fa741494133f206d2b630708d7036517c1c953b Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Tue, 28 Apr 2020 14:58:57 -0400
Subject: Try to store ctest results

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c14ae58..258d452 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -41,7 +41,7 @@ jobs:
             .circleci/test_spm.sh
 
       - store_test_results:
-          path: /tmp/test-reports
+          path: /tmp/test-results
 
   build-macos:
     macos:
@@ -76,7 +76,7 @@ jobs:
             .circleci/test_spm.sh
 
       - store_test_results:
-          path: /tmp/test-reports
+          path: /tmp/test-results
 
 workflows:
   version: 2
-- 
cgit 


From 66b90affe83f76f08c20d87722058a164d7b2885 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Tue, 28 Apr 2020 15:07:08 -0400
Subject: Create subdirectory

---
 .circleci/test_spm.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.circleci/test_spm.sh b/.circleci/test_spm.sh
index fc52e04..c7223dd 100755
--- a/.circleci/test_spm.sh
+++ b/.circleci/test_spm.sh
@@ -10,7 +10,7 @@ cd build
 set -x
 
 ctest -T test
-rsync -av Testing/*/*.xml "${TEST_RESULTS}"
+rsync -av Testing/*/*.xml "${TEST_RESULTS}"/spm
 
 spm --list
 
-- 
cgit 


From bb6f98d1d88e16890d075d25027177e54dec0b7f Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Tue, 28 Apr 2020 15:41:40 -0400
Subject: ctest to junit converter

---
 .circleci/ctest-to-junit.xsl | 134 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 134 insertions(+)
 create mode 100644 .circleci/ctest-to-junit.xsl

diff --git a/.circleci/ctest-to-junit.xsl b/.circleci/ctest-to-junit.xsl
new file mode 100644
index 0000000..75a5f78
--- /dev/null
+++ b/.circleci/ctest-to-junit.xsl
@@ -0,0 +1,134 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+<xsl:param name="pass" select="'this'"/>
+<xsl:output method="xml" indent="yes"/>
+<!-- convert ctest output to junit format -->
+<!--
+Inspired by https://stackoverflow.com/questions/6329215/how-to-get-ctest-results-in-hudson-jenkins
+Based on https://github.com/zanata/zanata-tests/blob/master/scripts/CTest2JUnit.xsl
+Extended by providing total Start date, total time, total test stats
+-->
+	<xsl:template match="/Site">
+            <xsl:variable name="StartDate"><xsl:value-of select="Testing/StartDateTime"/></xsl:variable>
+            <xsl:variable name="DoTime"><xsl:value-of select="Testing/EndTestTime - Testing/StartTestTime"/></xsl:variable>
+            <xsl:variable name="TotalTests"><xsl:value-of select="count(Testing/Test)"/></xsl:variable>
+            <xsl:variable name="Skipped"><xsl:value-of select="count(Testing/Test[@Status='notrun'])"/></xsl:variable>
+            <xsl:variable name="Disabled"><xsl:value-of select="count(Testing/Test/Results/Measurement[Value='Disabled'])"/></xsl:variable>
+            <xsl:variable name="Failed"><xsl:value-of select="count(Testing/Test[@Status='failed'])"/></xsl:variable>
+
+		<testsuite time="{$DoTime}" timestamp="{$StartDate}" tests="{$TotalTests}" failures="{$Failed}" skipped="{$Skipped}" disabled="{$Disabled}">
+
+			<xsl:variable name="BuildName"><xsl:value-of select="@BuildName"/></xsl:variable>
+			<xsl:variable name="BuildStamp"><xsl:value-of select="@BuildStamp"/></xsl:variable>
+			<xsl:variable name="Name"><xsl:value-of select="@Name"/></xsl:variable>
+			<xsl:variable name="Generator"><xsl:value-of select="@Generator"/></xsl:variable>
+			<xsl:variable name="CompilerName"><xsl:value-of select="@CompilerName"/></xsl:variable>
+			<xsl:variable name="OSName"><xsl:value-of select="@OSName"/></xsl:variable>
+			<xsl:variable name="Hostname"><xsl:value-of select="@Hostname"/></xsl:variable>
+			<xsl:variable name="OSRelease"><xsl:value-of select="@OSRelease"/></xsl:variable>
+			<xsl:variable name="OSVersion"><xsl:value-of select="@OSVersion"/></xsl:variable>
+			<xsl:variable name="OSPlatform"><xsl:value-of select="@OSPlatform"/></xsl:variable>
+			<xsl:variable name="Is64Bits"><xsl:value-of select="@Is64Bits"/></xsl:variable>
+			<xsl:variable name="VendorString"><xsl:value-of select="@VendorString"/></xsl:variable>
+			<xsl:variable name="VendorID"><xsl:value-of select="@VendorID"/></xsl:variable>
+			<xsl:variable name="FamilyID"><xsl:value-of select="@FamilyID"/></xsl:variable>
+			<xsl:variable name="ModelID"><xsl:value-of select="@ModelID"/></xsl:variable>
+			<xsl:variable name="ProcessorCacheSize"><xsl:value-of select="@ProcessorCacheSize"/></xsl:variable>
+			<xsl:variable name="NumberOfLogicalCPU"><xsl:value-of select="@NumberOfLogicalCPU"/></xsl:variable>
+			<xsl:variable name="NumberOfPhysicalCPU"><xsl:value-of select="@NumberOfPhysicalCPU"/></xsl:variable>
+			<xsl:variable name="TotalVirtualMemory"><xsl:value-of select="@TotalVirtualMemory"/></xsl:variable>
+			<xsl:variable name="TotalPhysicalMemory"><xsl:value-of select="@TotalPhysicalMemory"/></xsl:variable>
+			<xsl:variable name="LogicalProcessorsPerPhysical"><xsl:value-of select="@LogicalProcessorsPerPhysical"/></xsl:variable>
+			<xsl:variable name="ProcessorClockFrequency"><xsl:value-of select="@ProcessorClockFrequency"/></xsl:variable>
+			<properties>
+				<property name="BuildName" value="{$BuildName} {$DoTime}" />
+				<property name="BuildStamp" value="{$BuildStamp}" />
+				<property name="Name" value="{$Name}" />
+				<property name="Generator" value="{$Generator}" />
+				<property name="CompilerName" value="{$CompilerName}" />
+				<property name="OSName" value="{$OSName}" />
+				<property name="Hostname" value="{$Hostname}" />
+				<property name="OSRelease" value="{$OSRelease}" />
+				<property name="OSVersion" value="{$OSVersion}" />
+				<property name="OSPlatform" value="{$OSPlatform}" />
+				<property name="Is64Bits" value="{$Is64Bits}" />
+				<property name="VendorString" value="{$VendorString}" />
+				<property name="VendorID" value="{$VendorID}" />
+				<property name="FamilyID" value="{$FamilyID}" />
+				<property name="ModelID" value="{$ModelID}" />
+				<property name="ProcessorCacheSize" value="{$ProcessorCacheSize}" />
+				<property name="NumberOfLogicalCPU" value="{$NumberOfLogicalCPU}" />
+				<property name="NumberOfPhysicalCPU" value="{$NumberOfPhysicalCPU}" />
+				<property name="TotalVirtualMemory" value="{$TotalVirtualMemory}" />
+				<property name="TotalPhysicalMemory" value="{$TotalPhysicalMemory}" />
+				<property name="LogicalProcessorsPerPhysical" value="{$LogicalProcessorsPerPhysical}" />
+				<property name="ProcessorClockFrequency" value="{$ProcessorClockFrequency}" />
+			</properties>
+			<xsl:apply-templates select="Testing/Test"/>
+			
+			<system-out>
+				BuildName: <xsl:value-of select="$BuildName" />
+				BuildStamp: <xsl:value-of select="$BuildStamp" />
+				Name: <xsl:value-of select="$Name" />
+				Generator: <xsl:value-of select="$Generator" />
+				CompilerName: <xsl:value-of select="$CompilerName" />
+				OSName: <xsl:value-of select="$OSName" />
+				Hostname: <xsl:value-of select="$Hostname" />
+				OSRelease: <xsl:value-of select="$OSRelease" />
+				OSVersion: <xsl:value-of select="$OSVersion" />
+				OSPlatform: <xsl:value-of select="$OSPlatform" />
+				Is64Bits: <xsl:value-of select="$Is64Bits" />
+				VendorString: <xsl:value-of select="$VendorString" />
+				VendorID: <xsl:value-of select="$VendorID" />
+				FamilyID: <xsl:value-of select="$FamilyID" />
+				ModelID: <xsl:value-of select="$ModelID" />
+				ProcessorCacheSize: <xsl:value-of select="$ProcessorCacheSize" />
+				NumberOfLogicalCPU: <xsl:value-of select="$NumberOfLogicalCPU" />
+				NumberOfPhysicalCPU: <xsl:value-of select="$NumberOfPhysicalCPU" />
+				TotalVirtualMemory: <xsl:value-of select="$TotalVirtualMemory" />
+				TotalPhysicalMemory: <xsl:value-of select="$TotalPhysicalMemory" />
+				LogicalProcessorsPerPhysical: <xsl:value-of select="$LogicalProcessorsPerPhysical" />
+				ProcessorClockFrequency: <xsl:value-of select="$ProcessorClockFrequency" />
+			</system-out>
+		</testsuite>
+	</xsl:template>
+
+    <xsl:template match="Testing/Test">
+        <xsl:variable name="testcasename"><xsl:value-of select="Name"/></xsl:variable>
+        <xsl:variable name="testclassname"><xsl:value-of select="concat($pass, substring(Path,2))"/></xsl:variable>
+		<xsl:variable name="exectime">
+			<xsl:for-each select="Results/NamedMeasurement">
+				<xsl:if test="@name='Execution Time'">
+					<xsl:value-of select="Value"/>
+				</xsl:if>
+			</xsl:for-each>
+		</xsl:variable>
+		
+			<testcase name="{$testcasename}" classname="{$testclassname}" time="{$exectime}">
+            <xsl:if test="@Status = 'passed'">
+            <system-out><xsl:value-of select="Results/Measurement/Value/text()"/></system-out>
+            </xsl:if>
+            <xsl:if test="@Status = 'failed'">
+				<xsl:variable name="failtype">
+					<xsl:for-each select="Results/NamedMeasurement">
+						<xsl:if test="@name = 'Exit Code'">
+							<xsl:value-of select="Value"/>
+						</xsl:if>
+					</xsl:for-each>
+				</xsl:variable>
+				<xsl:variable name="failcode">
+					<xsl:for-each select="Results/NamedMeasurement">
+						<xsl:if test="@name = 'Exit Value'">
+							<xsl:value-of select="Value"/>
+						</xsl:if>
+					</xsl:for-each>
+				</xsl:variable>
+                <failure message="{$failtype} ({$failcode})"><xsl:value-of select="Results/Measurement/Value/text()" /></failure>
+            </xsl:if>
+            <xsl:if test="@Status = 'notrun'">
+                <skipped><xsl:value-of select="Results/Measurement/Value/text()" /></skipped>
+            </xsl:if>
+        </testcase>
+    </xsl:template>
+
+</xsl:stylesheet>
+
-- 
cgit 


From cbad0718236c82616180c649dd3b67e65d30173f Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Tue, 28 Apr 2020 15:41:50 -0400
Subject: Use converter

---
 .circleci/test_spm.sh | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/.circleci/test_spm.sh b/.circleci/test_spm.sh
index c7223dd..104e8fb 100755
--- a/.circleci/test_spm.sh
+++ b/.circleci/test_spm.sh
@@ -4,13 +4,15 @@ source $(dirname "${BASH_SOURCE[0]}")/runtime.sh
 export TEST_RESULTS=${TEST_RESULTS:-/tmp/test-results}
 export PREFIX=/tmp/root
 export SHELL=/bin/bash
-mkdir -p "${TEST_RESULTS}"
+mkdir -p "${TEST_RESULTS}"/spm
 cd build
 
 set -x
 
 ctest -T test
-rsync -av Testing/*/*.xml "${TEST_RESULTS}"/spm
+xsltproc \
+    ../.circleci/ctest-to-junit.xsl \
+    Testing/$(head -n 1 < Testing/TAG)/Test.xml > "${TEST_RESULTS}"/spm/Test.xml
 
 spm --list
 
-- 
cgit 


From 0f4aa4d47e7bf98c10d461639782a2361becb8c0 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Tue, 28 Apr 2020 15:50:48 -0400
Subject: Install xsltproc

---
 .circleci/init.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.circleci/init.sh b/.circleci/init.sh
index 877b9de..24b2f81 100755
--- a/.circleci/init.sh
+++ b/.circleci/init.sh
@@ -14,7 +14,8 @@ if [[ $(uname -s) == Linux ]]; then
         gcc \
         gcc-c++ \
         gcc-gfortran \
-        glibc-devel
+        glibc-devel \
+        libxslt
 
     ln -s cmake3 /usr/bin/cmake
     ln -s ctest3 /usr/bin/ctest
-- 
cgit