diff options
| author | Matthew Harmsen <mharmsen@redhat.com> | 2012-02-23 18:42:02 -0800 |
|---|---|---|
| committer | Matthew Harmsen <mharmsen@redhat.com> | 2012-02-23 18:42:02 -0800 |
| commit | 84ba9e3cb3bbdc89852aaf70185980ce2d9e325a (patch) | |
| tree | 1a6968ba40c8798420f34fe3e9bcd7d929fcb3c6 | |
| parent | 1c4c45a87e62a74b68b7d235e94cfe5dc21b8da2 (diff) | |
| download | pki-84ba9e3cb3bbdc89852aaf70185980ce2d9e325a.tar.gz pki-84ba9e3cb3bbdc89852aaf70185980ce2d9e325a.tar.xz pki-84ba9e3cb3bbdc89852aaf70185980ce2d9e325a.zip | |
Exclude junit tests from non-java components
PKI TRAC Ticket #104 - exclude the java-based junit testing infrastructure
from non-java components in order to build within a 'mock' environment
| -rw-r--r-- | pki/CMakeLists.txt | 10 | ||||
| -rw-r--r-- | pki/base/CMakeLists.txt | 4 | ||||
| -rwxr-xr-x | pki/scripts/compose_ipa_pki_theme_packages | 2 | ||||
| -rwxr-xr-x | pki/scripts/compose_pki_ra_packages | 2 | ||||
| -rwxr-xr-x | pki/scripts/compose_pki_tps_packages | 2 |
5 files changed, 14 insertions, 6 deletions
diff --git a/pki/CMakeLists.txt b/pki/CMakeLists.txt index 86b914ab9..953250259 100644 --- a/pki/CMakeLists.txt +++ b/pki/CMakeLists.txt @@ -63,9 +63,15 @@ macro_ensure_out_of_source_build("${PROJECT_NAME} requires an out of source buil # add macros include(MacroCopyFile) include(UseJava) -include(JUnit) -add_custom_target(test) +# required for all PKI components EXCEPT IPA_PKI_THEME, PKI_RA, and PKI_TPS +if (NOT APPLICATION_FLAVOR_IPA_PKI_THEME AND + NOT APPLICATION_FLAVOR_PKI_RA AND + NOT APPLICATION_FLAVOR_PKI_TPS) + include(JUnit) + + add_custom_target(test) +endif () # search for libraries diff --git a/pki/base/CMakeLists.txt b/pki/base/CMakeLists.txt index cd58e3037..b5ea9b9fb 100644 --- a/pki/base/CMakeLists.txt +++ b/pki/base/CMakeLists.txt @@ -2,8 +2,8 @@ project(base) # The order is important! # add_subdirectory(osutil) -add_subdirectory(test) if (APPLICATION_FLAVOR_PKI_CORE) + add_subdirectory(test) add_subdirectory(setup) add_subdirectory(symkey) add_subdirectory(native-tools) @@ -24,8 +24,10 @@ if (APPLICATION_FLAVOR_PKI_TPS) add_subdirectory(tps) endif (APPLICATION_FLAVOR_PKI_TPS) if (APPLICATION_FLAVOR_PKI_CONSOLE) + add_subdirectory(test) add_subdirectory(console) endif (APPLICATION_FLAVOR_PKI_CONSOLE) if (APPLICATION_FLAVOR_PKI_MIGRATE) + add_subdirectory(test) add_subdirectory(migrate) endif (APPLICATION_FLAVOR_PKI_MIGRATE) diff --git a/pki/scripts/compose_ipa_pki_theme_packages b/pki/scripts/compose_ipa_pki_theme_packages index 4d1e49416..e52cb7931 100755 --- a/pki/scripts/compose_ipa_pki_theme_packages +++ b/pki/scripts/compose_ipa_pki_theme_packages @@ -39,7 +39,7 @@ IPA_PKI_THEME_VERSION="10.0.0.a1" ## PKI_SPECS_FILE="${PKI_DIR}/specs/${IPA_PKI_THEME}.spec" -PKI_COMPONENT_LIST="test common-ui ca-ui" +PKI_COMPONENT_LIST="common-ui ca-ui" ## diff --git a/pki/scripts/compose_pki_ra_packages b/pki/scripts/compose_pki_ra_packages index 8a5476f9d..5e7626f88 100755 --- a/pki/scripts/compose_pki_ra_packages +++ b/pki/scripts/compose_pki_ra_packages @@ -39,7 +39,7 @@ PKI_RA_VERSION="10.0.0.a1" ## PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_RA}.spec" -PKI_COMPONENT_LIST="test ra" +PKI_COMPONENT_LIST="ra" ## diff --git a/pki/scripts/compose_pki_tps_packages b/pki/scripts/compose_pki_tps_packages index 7e4b95db7..c84f94d13 100755 --- a/pki/scripts/compose_pki_tps_packages +++ b/pki/scripts/compose_pki_tps_packages @@ -39,7 +39,7 @@ PKI_TPS_VERSION="10.0.0.a1" ## PKI_SPECS_FILE="${PKI_DIR}/specs/${PKI_TPS}.spec" -PKI_COMPONENT_LIST="test tps" +PKI_COMPONENT_LIST="tps" ## |