diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-09-20 00:43:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-09-20 00:43:02 +0000 |
| commit | 9e342cc5bd5df00bf0aaaeede068333122199c7d (patch) | |
| tree | 45e13db319692379e203c5eb34315b119f6a3d64 /tests | |
| parent | 333fde2da85fc9c4abd93b8a5fc6071632d2e64f (diff) | |
| parent | fea089bbd64304fc2b2dd87c7c697657e91a429c (diff) | |
| download | python-jenkins-job-builder-9e342cc5bd5df00bf0aaaeede068333122199c7d.tar.gz python-jenkins-job-builder-9e342cc5bd5df00bf0aaaeede068333122199c7d.tar.xz python-jenkins-job-builder-9e342cc5bd5df00bf0aaaeede068333122199c7d.zip | |
Merge "Default cmake config to newest plugin format"
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/builders/fixtures/cmake/version-1.10/common-1.x.xml | 4 | ||||
| -rw-r--r-- | tests/builders/fixtures/cmake/version-1.10/complete-1.x.xml | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/tests/builders/fixtures/cmake/version-1.10/common-1.x.xml b/tests/builders/fixtures/cmake/version-1.10/common-1.x.xml index b9c54a26..59f0ac1d 100644 --- a/tests/builders/fixtures/cmake/version-1.10/common-1.x.xml +++ b/tests/builders/fixtures/cmake/version-1.10/common-1.x.xml @@ -8,13 +8,13 @@ <preloadScript/> <buildDir>path/to/build</buildDir> <installDir>path/to/install</installDir> - <buildType>Debug</buildType> - <otherBuildType/> <makeCommand>make</makeCommand> <installCommand>make install</installCommand> <cmakeArgs/> <projectCmakePath/> <cleanInstallDir>false</cleanInstallDir> + <buildType>Debug</buildType> + <otherBuildType/> <builderImpl/> </hudson.plugins.cmake.CmakeBuilder> </builders> diff --git a/tests/builders/fixtures/cmake/version-1.10/complete-1.x.xml b/tests/builders/fixtures/cmake/version-1.10/complete-1.x.xml index 1e20ddba..e10d2e5d 100644 --- a/tests/builders/fixtures/cmake/version-1.10/complete-1.x.xml +++ b/tests/builders/fixtures/cmake/version-1.10/complete-1.x.xml @@ -8,13 +8,13 @@ <preloadScript>path/to/source/cmake.preload</preloadScript> <buildDir>path/to/build</buildDir> <installDir>path/to/install</installDir> - <buildType>Debug</buildType> - <otherBuildType>CustomReleaseType</otherBuildType> <makeCommand>/usr/bin/make</makeCommand> <installCommand>make new-install</installCommand> <cmakeArgs>-DCMAKE_FIND_ROOT_PATH="path/to/something/else"</cmakeArgs> <projectCmakePath>/usr/bin/cmake</projectCmakePath> <cleanInstallDir>true</cleanInstallDir> + <buildType>Debug</buildType> + <otherBuildType>CustomReleaseType</otherBuildType> <builderImpl/> </hudson.plugins.cmake.CmakeBuilder> </builders> |