Commit f05deeabda1d5af950e429740df72cc0856410c8

Authored by Jojo-1000
Committed by Jan
1 parent b31fc25f

Fix google test download: master renamed to main.

Jenkinsfile deleted
1 -timestamps {  
2 - node('master')  
3 - {  
4 - stage('SCM')  
5 - {  
6 - checkout scm  
7 - }  
8 - stage('Build')  
9 - {  
10 - sh returnStatus: true, script: 'rm -r build'  
11 - sh '''#!/bin/bash  
12 - mkdir build  
13 - cd build  
14 - cmake .. -Dhueplusplus_TESTS=ON  
15 - make -j8 2>&1 | tee buildlog.txt  
16 - test ${PIPESTATUS[0]} -eq 0'''  
17 - }  
18 - stage('Test')  
19 - {  
20 - sh '''cd build  
21 - hueplusplus/test/test_HuePlusPlus --gtest_output=xml:test.xml  
22 - make -j8 coveragetest'''  
23 - step([$class: 'XUnitBuilder', testTimeMargin: '3000', thresholdMode: 1,  
24 - thresholds: [  
25 - [$class: 'FailedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: ''],  
26 - [$class: 'SkippedThreshold', failureNewThreshold: '', failureThreshold: '', unstableNewThreshold: '', unstableThreshold: '']  
27 - ],  
28 - tools: [  
29 - [$class: 'GoogleTestType', deleteOutputFiles: true, failIfNotNew: true, pattern: 'build/test.xml', skipNoTestFiles: false, stopProcessingIfError: true]  
30 - ]  
31 - ])  
32 - publishHTML(  
33 - [allowMissing: false, alwaysLinkToLastBuild: false, keepAll: false, reportDir: 'build/coveragetest', reportFiles: 'index.html', reportName: 'Coveragetest', reportTitles: '']  
34 - )  
35 - }  
36 - stage('CppCheck')  
37 - {  
38 - sh 'cppcheck -j 8 --force -ihueplusplus/test -ihueplusplus/jsoncpp.cpp hueplusplus/ 2>build/CppCheckResult'  
39 - rtp nullAction: '1', parserName: 'HTML', stableText: '${FILE:build/CppCheckResult}'  
40 - }  
41 - stage('Documentation')  
42 - {  
43 - sh 'doxygen Doxyfile'  
44 - publishHTML([allowMissing: false, alwaysLinkToLastBuild: false, keepAll: false, reportDir: 'doc/html/', reportFiles: 'index.html', reportName: 'Doxygen'])  
45 - }  
46 - stage('Parse warnings')  
47 - {  
48 - warnings canComputeNew: false, canResolveRelativePaths: false, categoriesPattern: '', defaultEncoding: '', excludePattern: '', healthy: '', includePattern: '', messagesPattern: '', parserConfigurations: [[parserName: 'Doxygen', pattern: 'doxylog.txt']], unHealthy: ''  
49 - sh returnStatus: true, script: 'rm doxylog.txt'  
50 - warnings canComputeNew: false, canResolveRelativePaths: false, categoriesPattern: '', defaultEncoding: '', excludePattern: '', healthy: '', includePattern: '', messagesPattern: '', parserConfigurations: [[parserName: 'GNU C Compiler 4 (gcc)', pattern: 'build/buildlog.txt']], unHealthy: ''  
51 - sh returnStatus: true, script: 'rm build/buildlog.txt'  
52 - }  
53 - }  
54 -  
55 -}  
test/CMakeLists.txt.in
@@ -5,7 +5,7 @@ project(googletest-download NONE) @@ -5,7 +5,7 @@ project(googletest-download NONE)
5 include(ExternalProject) 5 include(ExternalProject)
6 ExternalProject_Add(googletest 6 ExternalProject_Add(googletest
7 GIT_REPOSITORY https://github.com/google/googletest.git 7 GIT_REPOSITORY https://github.com/google/googletest.git
8 - GIT_TAG master 8 + GIT_TAG main
9 SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src" 9 SOURCE_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-src"
10 BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build" 10 BINARY_DIR "${CMAKE_CURRENT_BINARY_DIR}/googletest-build"
11 CONFIGURE_COMMAND "" 11 CONFIGURE_COMMAND ""