diff options
author | Abhishek Koneru <akoneru@redhat.com> | 2013-11-13 18:50:50 -0500 |
---|---|---|
committer | Abhishek Koneru <akoneru@redhat.com> | 2013-11-13 18:50:50 -0500 |
commit | 2442de787890cc6a7ea703f26fd1527718b2ac1b (patch) | |
tree | 6031b7f1e58b1d6ea88d3178f61b3dad2e7ed61f | |
parent | 029bf78aeba1f68d5c5a618086d55bc4cbe17b6c (diff) | |
download | pki-2442de787890cc6a7ea703f26fd1527718b2ac1b.tar.gz pki-2442de787890cc6a7ea703f26fd1527718b2ac1b.tar.xz pki-2442de787890cc6a7ea703f26fd1527718b2ac1b.zip |
Minor changes to the test scripts.
Removed unnecessary lines and changed the classpath used to build
the JUnit tests.
-rw-r--r-- | scripts/compose_functions | 2 | ||||
-rwxr-xr-x | scripts/compose_pki_core_packages | 1 | ||||
-rwxr-xr-x | scripts/compose_pki_test_package | 12 |
3 files changed, 2 insertions, 13 deletions
diff --git a/scripts/compose_functions b/scripts/compose_functions index 9271a0bc0..d5996ae1b 100644 --- a/scripts/compose_functions +++ b/scripts/compose_functions @@ -293,7 +293,7 @@ Create_repo_after_build() if [ ! -e $repo_location ] ; then mkdir -p $repo_location fi - cp -r RPMS SOURCES SRPMS SPECS $repo_location + cp -r RPMS SRPMS $repo_location createrepo $REPOSITORY_LOCATION/RPMS/noarch/ createrepo $REPOSITORY_LOCATION/RPMS/x86_64/ createrepo $REPOSITORY_LOCATION/SRPMS/ diff --git a/scripts/compose_pki_core_packages b/scripts/compose_pki_core_packages index fbd2b96b1..ab955827d 100755 --- a/scripts/compose_pki_core_packages +++ b/scripts/compose_pki_core_packages @@ -215,7 +215,6 @@ bash ./package_${PKI_CORE} | tee package_${PKI_CORE}.log 2>&1 if [ "$CREATEREPO" == "Y" ] ; then echo "Creating a repository of the built rpms" - cp -r $PKI_PWD/$PKI_DIR/scripts/repository.cfg . cp -r $PKI_PWD/$PKI_DIR/scripts/scp_the_repo.exp . Create_repo_after_build $REPO_CFG_FILE fi diff --git a/scripts/compose_pki_test_package b/scripts/compose_pki_test_package index 705cd9859..879c48a92 100755 --- a/scripts/compose_pki_test_package +++ b/scripts/compose_pki_test_package @@ -63,23 +63,13 @@ cp -r "$PKI_SOURCE_DIR/tests" . ### Compile the java test source ### -if [ ! -d "$PKI_SOURCE_DIR/build/classes" ] ; then - - echo "\nThe java tests cannot be compiled since the pki source is not compiled/built.\n" - echo "The core sources can be compiled either by eclipse or using the compose scripts.\n" - echo "Cannot build the test RPM." - - exit -1 - -fi - cd tests/dogtag/dev_java_tests rm -rf bin mkdir bin -CLASSPATH=$PKI_SOURCE_DIR/build/classes:/usr/share/java/junit4.jar:`pwd`/src:/usr/lib64/jss/jss4.jar:/usr/share/java/httpcomponents/httpclient.jar:/usr/share/java/httpcomponents/httpcore.jar:/usr/share/java/resteasy/jaxrs-api.jar:/usr/share/java/resteasy/resteasy-atom-provider.jar:/usr/share/java/resteasy/resteasy-jaxb-provider.jar:/usr/share/java/resteasy/resteasy-jaxrs.jar:/usr/share/java/resteasy/resteasy-jaxrs-jandex.jar:/usr/share/java/resteasy/resteasy-jettison-provider.jar:/usr/share/java/apache-commons-cli.jar:/usr/share/java/apache-commons-codec.jar:/usr/share/java/apache-commons-logging.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/idm-console-base-1.1.7.jar:/usr/share/java/idm-console-mcc.jar:/usr/share/java/idm-console-nmclf.jar:/usr/share/java/jakarta-commons-httpclient.jar:/usr/share/java/jaxb-api.jar:/usr/share/java/ldapjdk.jar:/usr/share/java/apache-commons-lang.jar:/usr/share/java/istack-commons-runtime.jar:/usr/share/java/scannotation.jar:/usr/share/java/servlet.jar:/usr/share/java/velocity.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/xml-commons-apis.jar:/usr/share/java/tomcat/catalina.jar:/usr/share/java/tomcat/tomcat-util.jar:/usr/share/java/commons-io.jar +CLASSPATH=$PKI_SOURCE_DIR/base/test/src:$PKI_SOURCE_DIR/tests/dogtag/dev_java_tests/src:$PKI_SOURCE_DIR/base/symkey/src:$PKI_SOURCE_DIR/base/util/src:$PKI_SOURCE_DIR/base/util/test:$PKI_SOURCE_DIR/base/common/src:$PKI_SOURCE_DIR/base/common/functional/src:$PKI_SOURCE_DIR/base/java-tools/src:$PKI_SOURCE_DIR/base/server/tomcat/src:$PKI_SOURCE_DIR/base/server/cms/src:$PKI_SOURCE_DIR/base/server/cmscore/src:$PKI_SOURCE_DIR/base/server/test:$PKI_SOURCE_DIR/base/silent/src:$PKI_SOURCE_DIR/base/ca/src:$PKI_SOURCE_DIR/base/ca/functional/src:$PKI_SOURCE_DIR/base/kra/src:$PKI_SOURCE_DIR/base/kra/functional/src:$PKI_SOURCE_DIR/base/ocsp/src:$PKI_SOURCE_DIR/base/tks/src:$PKI_SOURCE_DIR/base/tps-tomcat/src:$PKI_SOURCE_DIR/base/migrate/80:/usr/share/java/junit4.jar:`pwd`/src:/usr/lib64/jss/jss4.jar:/usr/share/java/httpcomponents/httpclient.jar:/usr/share/java/httpcomponents/httpcore.jar:/usr/share/java/resteasy/jaxrs-api.jar:/usr/share/java/resteasy/resteasy-atom-provider.jar:/usr/share/java/resteasy/resteasy-jaxb-provider.jar:/usr/share/java/resteasy/resteasy-jaxrs.jar:/usr/share/java/resteasy/resteasy-jaxrs-jandex.jar:/usr/share/java/resteasy/resteasy-jettison-provider.jar:/usr/share/java/apache-commons-cli.jar:/usr/share/java/apache-commons-codec.jar:/usr/share/java/apache-commons-logging.jar:/usr/share/java/commons-codec.jar:/usr/share/java/commons-httpclient.jar:/usr/share/java/idm-console-base-1.1.7.jar:/usr/share/java/idm-console-mcc.jar:/usr/share/java/idm-console-nmclf.jar:/usr/share/java/jakarta-commons-httpclient.jar:/usr/share/java/jaxb-api.jar:/usr/share/java/ldapjdk.jar:/usr/share/java/apache-commons-lang.jar:/usr/share/java/istack-commons-runtime.jar:/usr/share/java/scannotation.jar:/usr/share/java/servlet.jar:/usr/share/java/velocity.jar:/usr/share/java/xerces-j2.jar:/usr/share/java/xml-commons-apis.jar:/usr/share/java/tomcat/catalina.jar:/usr/share/java/tomcat/tomcat-util.jar:/usr/share/java/commons-io.jar javac -classpath $CLASSPATH -d bin src/*java |