From 88241f62e3639bf6731566fb9f9bc9c63e314ec9 Mon Sep 17 00:00:00 2001 From: Qstick Date: Sun, 11 Aug 2019 01:13:17 -0400 Subject: [PATCH] switch coverage to windows where opencover actually works --- azure-pipelines.yml | 4 ++-- test.sh | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 6a28e7288..1c6d0cefd 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -322,7 +322,7 @@ stages: - job: Unit_Test_Coverage displayName: Coverage pool: - vmImage: 'ubuntu-16.04' + vmImage: 'vs2017-win2016' steps: - checkout: self - task: DownloadPipelineArtifact@2 @@ -336,7 +336,7 @@ stages: inputs: targetType: 'filePath' filePath: ./test.sh - arguments: Linux Unit Coverage + arguments: Windows Unit Coverage - task: PublishCodeCoverageResults@1 displayName: Publish Coverage Results inputs: diff --git a/test.sh b/test.sh index e8bb44d33..28a0b5919 100755 --- a/test.sh +++ b/test.sh @@ -21,7 +21,6 @@ export LIDARR_TESTS_LOG_OUTPUT="File" NUNIT="$TEST_DIR/NUnit.ConsoleRunner.3.7.0/tools/nunit3-console.exe" OPEN_COVER="$TEST_DIR/OpenCover.4.7.922/tools/OpenCover.Console.exe" NUNIT_COMMAND="$NUNIT" -OC_COMMAND="$OPEN_COVER" NUNIT_PARAMS="--workers=1" if [ "$PLATFORM" = "Mac" ]; then @@ -37,7 +36,6 @@ elif [ "$PLATFORM" = "Linux" ] || [ "$PLATFORM" = "Mac" ] ; then mkdir -p ~/.config/Lidarr WHERE="$WHERE && cat != WINDOWS" NUNIT_COMMAND="mono --debug --runtime=v4.0 $NUNIT" - OC_COMMAND="mono --debug --runtime=v4.0 $OPEN_COVER" else echo "Platform must be provided as first arguement: Windows, Linux or Mac" exit 1 @@ -59,8 +57,12 @@ for i in `find $TEST_DIR -name "$TEST_PATTERN"`; done if [ "$COVERAGE" = "Coverage" ]; then - $OC_COMMAND -register:user -target:"$NUNIT" -targetargs:"$NUNIT_PARAMS --where=\"$WHERE\" $ASSEMBLIES" -output:"$COVERAGE_FILE"; - EXIT_CODE=$? + if [ "$PLATFORM" = "Windows" ] ; then + $OPEN_COVER -register:user -target:"$NUNIT" -targetargs:"$NUNIT_PARAMS --where=\"$WHERE\" $ASSEMBLIES" -output:"$COVERAGE_FILE"; + EXIT_CODE=$? + else + echo "Coverage only supported on Windows" + exit 3 elif [ "$COVERAGE" = "Test" ] ; then $NUNIT_COMMAND --where "$WHERE" $NUNIT_PARAMS $ASSEMBLIES; EXIT_CODE=$?