[jbossws-commits] JBossWS SVN: r19752 - hudson/trunk/scripts.
Author: jim.ma
Date: 2015-05-19 04:43:02 -0400 (Tue, 19 May 2015)
New Revision: 19752
Modified:
hudson/trunk/scripts/jbossws-qa.sh
Log:
Add secmgr to maven profile
Modified: hudson/trunk/scripts/jbossws-qa.sh
===================================================================
--- hudson/trunk/scripts/jbossws-qa.sh 2015-05-18 09:45:55 UTC (rev 19751)
+++ hudson/trunk/scripts/jbossws-qa.sh 2015-05-19 08:43:02 UTC (rev 19752)
@@ -27,19 +27,6 @@
fi
}
-setupSecMgrEnv() {
- if [ "x$SECMGR" = "x" ]; then
- export SECMGR=true
- fi
-}
-
-unsetSecMgrEnv() {
- if [ "x$SECMGR" != "x" ]; then
- unset SECMGR
- fi
-}
-
-
logMavenDependencies() {
cd $STACK_DIR
mvn -Ptestsuite,spring,dist clean
@@ -69,6 +56,11 @@
mvn $ENVIRONMENT -Phudson,$JBOSS_TARGET $TEST_OPTS integration-test 2>&1 | tee
$WORKSPACE/tests.log
}
+runTestsViaMavenWithSecMgr() {
+ echo "TEST_OPTS: $TEST_OPTS"
+ mvn $ENVIRONMENT -Phudson,$JBOSS_TARGET,secmgr $TEST_OPTS integration-test 2>&1
| tee $WORKSPACE/tests.log
+}
+
coreTestWithSpring() {
setupEnv
ensureJavaExists
@@ -90,11 +82,9 @@
coreTestWithSecMgr() {
setupEnv
- setupSecMgrEnv
ensureJavaExists
logMavenDependencies
- runTestsViaMaven
- unsetSecMgrEnv
+ runTestsViaMavenWithSecMgr
copyTestLogs
detectFailures
}