opensource/kubo
1
0
Fork 0
mirror of https://github.com/ipfs/kubo.git synced 2025-06-28 17:03:58 +08:00
Code Issues Projects Releases Wiki Activity

sharness/junit: Better test tree in jenkins

Browse Source 
License: MIT
Signed-off-by: Łukasz Magiera <magik6k@gmail.com>
This commit is contained in:
Łukasz Magiera
2018-03-22 04:32:08 +01:00
parent d6fe0c195d
commit d25e82616e
2 changed files with 20 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
test/sharness/lib/0001-Generate-partial-JUnit-reports.patch
View File

@ -1,14 +1,14 @@
From 8b4a5cd6ebf9dfa462d869559b85b17d2b277d06 Mon Sep 17 00:00:00 2001 From 76b34f25b2bacdd30138b25ccbe0672d76a1632a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com> From: =?UTF-8?q?=C5=81ukasz=20Magiera?= <magik6k@gmail.com>
Date: Wed, 14 Mar 2018 21:26:35 +0100 Date: Thu, 22 Mar 2018 06:11:01 +0100
Subject: [PATCH] Generate partial JUnit reports Subject: [PATCH] Generate partial JUnit reports
--- ---
sharness.sh | 99 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++---- sharness.sh | 102 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
1 file changed, 93 insertions(+), 6 deletions(-) 1 file changed, 96 insertions(+), 6 deletions(-)
diff --git a/sharness.sh b/sharness.sh diff --git a/sharness.sh b/sharness.sh
index 6750ff7..dc99ef9 100644 index 6750ff7..7d9915a 100644
--- a/sharness.sh --- a/sharness.sh
+++ b/sharness.sh +++ b/sharness.sh
@@ -1,4 +1,4 @@ @@ -1,4 +1,4 @@
@ -68,7 +68,7 @@ index 6750ff7..dc99ef9 100644
+ +
+ shift + shift
+ cat > "$tc_file" <<-EOF + cat > "$tc_file" <<-EOF
+ <testcase name="$test_count - $(echo $test_name | esc_xml) "> + <testcase name="$test_count - $(echo $test_name | esc_xml)" classname="sharness$(uname -s).${SHARNESS_TEST_NAME}">
+ $@ + $@
+ EOF + EOF
+ +
@ -152,7 +152,7 @@ index 6750ff7..dc99ef9 100644
+ +
+ if test -n "$TEST_GENERATE_JUNIT"; then + if test -n "$TEST_GENERATE_JUNIT"; then
+ cat > ".junit/case-$(printf "%04d" $test_count)" <<-EOF + cat > ".junit/case-$(printf "%04d" $test_count)" <<-EOF
+ <testcase name="$test_count - $(echo $2 | esc_xml)"> + <testcase name="$test_count - $(echo $2 | esc_xml)" classname="sharness$(uname -s).${SHARNESS_TEST_NAME}">
+ <skipped> + <skipped>
+ skip $(echo $1 | esc_xml) (missing $missing_prereq${of_prereq}) + skip $(echo $1 | esc_xml) (missing $missing_prereq${of_prereq})
+ </skipped> + </skipped>
@ -195,7 +195,7 @@ index 6750ff7..dc99ef9 100644
+ +
+ if test -n "$TEST_GENERATE_JUNIT"; then + if test -n "$TEST_GENERATE_JUNIT"; then
+ cat >>"$junit_results_path" <<-EOF + cat >>"$junit_results_path" <<-EOF
+ <testsuite errors="$test_broken" failures="$((test_failure+test_fixed))" tests="$test_count" name="$SHARNESS_TEST_FILE"> + <testsuite errors="$test_broken" failures="$((test_failure+test_fixed))" tests="$test_count" package="sharness$(uname -s).${SHARNESS_TEST_NAME}">
+ $(find .junit -name 'case-*' | sort | xargs cat) + $(find .junit -name 'case-*' | sort | xargs cat)
+ </testsuite> + </testsuite>
+ EOF + EOF
@ -203,7 +203,17 @@ index 6750ff7..dc99ef9 100644
fi fi
if test "$test_fixed" != 0; then if test "$test_fixed" != 0; then
@@ -771,6 +853,11 @@ mkdir -p "$test_dir" || exit 1 @@ -745,6 +827,9 @@ export PATH SHARNESS_BUILD_DIRECTORY
SHARNESS_TEST_FILE="$0"
export SHARNESS_TEST_FILE
+SHARNESS_TEST_NAME=$(basename ${SHARNESS_TEST_FILE} ".sh")
+export SHARNESS_TEST_NAME
+
# Prepare test area.
test_dir="trash directory.$(basename "$SHARNESS_TEST_FILE" ".$SHARNESS_TEST_EXTENSION")"
test -n "$root" && test_dir="$root/$test_dir"
@@ -771,6 +856,11 @@ mkdir -p "$test_dir" || exit 1
# in subprocesses like git equals our $PWD (for pathname comparisons). # in subprocesses like git equals our $PWD (for pathname comparisons).
cd -P "$test_dir" || exit 1 cd -P "$test_dir" || exit 1

2
test/sharness/lib/install-sharness.sh
View File

@ -7,7 +7,7 @@
# settings # settings
version=5eee9b51b5621cec95a64018f0cc779963b230d2 version=5eee9b51b5621cec95a64018f0cc779963b230d2
patch_version=1 patch_version=6
urlprefix=https://github.com/mlafeldt/sharness.git urlprefix=https://github.com/mlafeldt/sharness.git
if test ! -n "$clonedir" ; then if test ! -n "$clonedir" ; then