From 6f6fc4f8b84bcefac08750839d7b2bc66809b7d4 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 26 May 2021 23:28:34 +0200
Subject: [PATCH] Revert "Use xsltproc to transform ctest error output."
This reverts commit c3b4e85b26ae14baa6c10e213d00fb00acc210e5.
---
.gitlab-ci.yml | 2 --
scripts/ci/extends/template-build-linux.yml | 18 ++--------
scripts/test/ctest-error-output.xsl | 38 ---------------------
3 files changed, 2 insertions(+), 56 deletions(-)
delete mode 100644 scripts/test/ctest-error-output.xsl
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 855abedabb0..524407119bc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -18,8 +18,6 @@ variables:
BUILD_PROCESSES: "" # Empty string: builds all processes
BUILD_TESTS: "true"
BUILD_CTEST: "true"
- # Test config
- NUM_CTEST_ERROR_LINES: 1000 # tail this much lines from failed output
workflow:
rules:
diff --git a/scripts/ci/extends/template-build-linux.yml b/scripts/ci/extends/template-build-linux.yml
index 3df1ac2b5ab..55ae76ad010 100644
--- a/scripts/ci/extends/template-build-linux.yml
+++ b/scripts/ci/extends/template-build-linux.yml
@@ -22,25 +22,11 @@
if [[ -z "$TARGETS" ]]; then
$BUILD_CMD_PREFIX cmake --build . --target package > >(tee make.output)
if [ "$BUILD_TESTS" = true ]; then $BUILD_CMD_PREFIX cmake --build . --target tests ; fi
-
- if [ "$BUILD_CTEST" = true ]; then
- ctest_labels="default"
- ctest_timeout=15
- if [ "$BUILD_CTEST_LARGE" = true ]; then
- ctest_labels="large|$ctest_labels"
- ctest_timeout=90
- fi
- ctest_exit=0
+ if [ "$BUILD_CTEST" = true ] ; then $BUILD_CMD_PREFIX cmake --build . --target ctest ; fi
if [[ "$OSTYPE" == "darwin"* ]]; then alias date=gdate ; fi
ctest -T Test --no-compress-output -L "$ctest_labels" --repeat until-pass:2 --stop-time `date -d "today + ${ctest_timeout} minutes" +'%H:%M:%S'` || ctest_exit=$?
- if [ $ctest_exit -ne 0 ]; then
- echo "ctests failed (showing the last ${NUM_CTEST_ERROR_LINES} lines):"
- xsltproc ${CI_PROJECT_DIR}/scripts/test/ctest-error-output.xsl Testing/*/Test.xml | tail -n ${NUM_CTEST_ERROR_LINES}
- exit $ctest_exit
- fi
+ if [ "$BUILD_CTEST" = true ] ; then cp Testing/**/Test.xml Tests/ctest.xml ; fi
cp Testing/**/Test.xml Tests/ctest.xml
- fi
-
else
$BUILD_CMD_PREFIX cmake --build . --target ${TARGETS} > >(tee make.output)
fi
diff --git a/scripts/test/ctest-error-output.xsl b/scripts/test/ctest-error-output.xsl
deleted file mode 100644
index c7161d37427..00000000000
--- a/scripts/test/ctest-error-output.xsl
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0"?>
-<!-- Was created with:
- xmlstarlet sel -C -t \
- -m "//*/Testing/Test[@Status='failed']" \
- -o '[ctest] ' -v './/Name' -o ':' -n -n \
- -v './/Results/Measurement/Value/text()' -n \
- -o '[ctest end]' -n -n \
- Testing/20210510-0943/Test.xml > ctest-error-output.xsl
--->
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:exslt="http://exslt.org/common" version="1.0" extension-element-prefixes="exslt">
- <xsl:output omit-xml-declaration="yes" indent="no"/>
- <xsl:template match="/">
- <xsl:for-each select="//*/Testing/Test[@Status='failed']">
- <xsl:text>[ctest] </xsl:text>
- <xsl:call-template name="value-of-template">
- <xsl:with-param name="select" select=".//Name"/>
- </xsl:call-template>
- <xsl:text>:</xsl:text>
- <xsl:value-of select="' '"/>
- <xsl:value-of select="' '"/>
- <xsl:call-template name="value-of-template">
- <xsl:with-param name="select" select=".//Results/Measurement/Value/text()"/>
- </xsl:call-template>
- <xsl:value-of select="' '"/>
- <xsl:text>[ctest end]</xsl:text>
- <xsl:value-of select="' '"/>
- <xsl:value-of select="' '"/>
- </xsl:for-each>
- </xsl:template>
- <xsl:template name="value-of-template">
- <xsl:param name="select"/>
- <xsl:value-of select="$select"/>
- <xsl:for-each select="exslt:node-set($select)[position()>1]">
- <xsl:value-of select="' '"/>
- <xsl:value-of select="."/>
- </xsl:for-each>
- </xsl:template>
-</xsl:stylesheet>
--
GitLab