From f5d879bd447bf8c8d26fcaff9cc528ca39e4269d Mon Sep 17 00:00:00 2001 From: Alexander Bock Date: Wed, 15 Jun 2022 12:28:19 +0200 Subject: [PATCH] Add the ability to centrally disable unit test running from Jenkins --- Jenkinsfile | 62 ++++++++++++++++++++++++++++++++--------------------- 1 file changed, 38 insertions(+), 24 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index bbb2cf43f6..f1725173ed 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -82,10 +82,12 @@ linux_gcc_make: { compileHelper.recordCompileIssues(compileHelper.Gcc()); } stage('linux-gcc-make/test') { - testHelper.runUnitTests('bin/codegentest'); - testHelper.runUnitTests('bin/SGCTTest'); - testHelper.runUnitTests('bin/GhoulTest'); - testHelper.runUnitTests('bin/OpenSpaceTest'); + if (env.RUN_UNIT_TESTS == 'true') { + testHelper.runUnitTests('bin/codegentest'); + testHelper.runUnitTests('bin/SGCTTest'); + testHelper.runUnitTests('bin/GhoulTest'); + testHelper.runUnitTests('bin/OpenSpaceTest'); + } } cleanWs() } // node('linux') @@ -105,10 +107,12 @@ linux_gcc_ninja: { compileHelper.build(compileHelper.Ninja(), compileHelper.Gcc(), cmakeCompileOptions, '', 'build-ninja'); } stage('linux-gcc-ninja/test') { - testHelper.runUnitTests('bin/codegentest'); - testHelper.runUnitTests('bin/SGCTTest'); - testHelper.runUnitTests('bin/GhoulTest'); - testHelper.runUnitTests('bin/OpenSpaceTest'); + if (env.RUN_UNIT_TESTS == 'true') { + testHelper.runUnitTests('bin/codegentest'); + testHelper.runUnitTests('bin/SGCTTest'); + testHelper.runUnitTests('bin/GhoulTest'); + testHelper.runUnitTests('bin/OpenSpaceTest'); + } } cleanWs() } // node('linux') @@ -129,10 +133,12 @@ linux_clang_make: { compileHelper.recordCompileIssues(compileHelper.Clang()); } stage('linux-clang-make/test') { - testHelper.runUnitTests('bin/codegentest'); - testHelper.runUnitTests('bin/SGCTTest'); - testHelper.runUnitTests('bin/GhoulTest'); - testHelper.runUnitTests('bin/OpenSpaceTest'); + if (env.RUN_UNIT_TESTS == 'true') { + testHelper.runUnitTests('bin/codegentest'); + testHelper.runUnitTests('bin/SGCTTest'); + testHelper.runUnitTests('bin/GhoulTest'); + testHelper.runUnitTests('bin/OpenSpaceTest'); + } } cleanWs() } // node('linux') @@ -152,10 +158,12 @@ linux_clang_ninja: { compileHelper.build(compileHelper.Ninja(), compileHelper.Clang(), cmakeCompileOptions, '', 'build-ninja'); } stage('linux-clang-ninja/test') { - testHelper.runUnitTests('bin/codegentest'); - testHelper.runUnitTests('bin/SGCTTest'); - testHelper.runUnitTests('bin/GhoulTest'); - testHelper.runUnitTests('bin/OpenSpaceTest'); + if (env.RUN_UNIT_TESTS == 'true') { + testHelper.runUnitTests('bin/codegentest'); + testHelper.runUnitTests('bin/SGCTTest'); + testHelper.runUnitTests('bin/GhoulTest'); + testHelper.runUnitTests('bin/OpenSpaceTest'); + } } cleanWs() } // node('linux') @@ -173,10 +181,12 @@ windows_msvc: { compileHelper.recordCompileIssues(compileHelper.VisualStudio()); } stage('windows-msvc/test') { - testHelper.runUnitTests('bin\\Debug\\codegentest'); - testHelper.runUnitTests('bin\\Debug\\SGCTTest'); - testHelper.runUnitTests('bin\\Debug\\GhoulTest'); - testHelper.runUnitTests('bin\\Debug\\OpenSpaceTest'); + if (env.RUN_UNIT_TESTS == 'true') { + testHelper.runUnitTests('bin\\Debug\\codegentest'); + testHelper.runUnitTests('bin\\Debug\\SGCTTest'); + testHelper.runUnitTests('bin\\Debug\\GhoulTest'); + testHelper.runUnitTests('bin\\Debug\\OpenSpaceTest'); + } } cleanWs() } // node('windows') @@ -213,8 +223,10 @@ macos_make: { compileHelper.build(compileHelper.Make(), compileHelper.Clang(), moduleCMakeFlags(), '', 'build-make'); } stage('macos-make/test') { - testHelper.runUnitTests('bin/Debug/OpenSpaceTest') - testHelper.runUnitTests('bin/Debug/codegentest') + if (env.RUN_UNIT_TESTS == 'true') { + testHelper.runUnitTests('bin/Debug/OpenSpaceTest') + testHelper.runUnitTests('bin/Debug/codegentest') + } } cleanWs() } // node('macos') @@ -231,8 +243,10 @@ macos_xcode: { compileHelper.build(compileHelper.Xcode(), compileHelper.Xcode(), moduleCMakeFlags(), '', 'build-xcode'); } stage('macos-xcode/test') { - testHelper.runUnitTests('bin/Debug/OpenSpaceTest') - testHelper.runUnitTests('bin/Debug/codegentest') + if (env.RUN_UNIT_TESTS == 'true') { + testHelper.runUnitTests('bin/Debug/OpenSpaceTest') + testHelper.runUnitTests('bin/Debug/codegentest') + } } cleanWs() } // node('macos')