Index: scripts/local.properties.template =================================================================== --- scripts/local.properties.template (revision 542462) +++ scripts/local.properties.template (working copy) @@ -1,6 +0,0 @@ -# Do you want to send email notifications and to where? and from whom? -# -# framework.parameters.usemail=some.smtp.host -# framework.parameters.usemail.to=some@mail.address.net -# framework.parameters.usemail.from=me@some.host - Index: scripts/parameters.xml =================================================================== --- scripts/parameters.xml (revision 542462) +++ scripts/parameters.xml (working copy) @@ -5,6 +5,11 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + # autogenerated file containing test run setup information + +# Selected test suites will be executed in the following order:${line.separator} + + + +# This order has been obtained on the base of the following +# information about dependencies between test suites:${line.separator} + + + + + + + + + + + + + + + + + + + + +Could not found some of the framework components. +Please, do buildtest install first. + + + + + + + + + + + + + + + + + + + + + + + ... +------ +ERROR: Could not find ${required.parameters.location}. Please, do 'setup' first. +------ + + + + + ... +------ +ERROR: Could not find ${selected.suites.configuration}. Please, do 'setup' first. +------ + + + + + + + + + + + + + + + + + + + + + + Index: scripts/download.xml =================================================================== --- scripts/download.xml (revision 542462) +++ scripts/download.xml (working copy) @@ -30,7 +30,7 @@ - + @@ -154,7 +154,7 @@ - ext.@{libname}.location=${ext.@{libname}.location} + ext.@{libname}.location=${ext.@{libname}.location} Index: scripts/adaptor-interface.xml =================================================================== --- scripts/adaptor-interface.xml (revision 542462) +++ scripts/adaptor-interface.xml (working copy) @@ -15,8 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - Index: scripts/cc-project.xml =================================================================== --- scripts/cc-project.xml (revision 542462) +++ scripts/cc-project.xml (working copy) @@ -15,8 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - Index: scripts/framework.properties =================================================================== --- scripts/framework.properties (revision 542462) +++ scripts/framework.properties (working copy) @@ -3,6 +3,8 @@ required.parameters.location=${root.dir}/required-parameters.properties backup.parameters.location=${root.dir}/backup-parameters.properties +external.resources.location=${root.dir}/resources.location +selected.suites.configuration=${root.dir}/selected-suites.properties external.libs.dir=${build.dir}/libs external.arch.dir=${build.dir}/arch @@ -22,6 +24,3 @@ cc.execution.status.file=${cc.work.dir}/execution.status cc.execution.status.file.header=\ Autogenerated file used for Test Suites execution status checking. -local.configuration.file=${root.dir}/framework.local.properties -local.configuration.template.file=${scripts.dir}/local.properties.template - Index: scripts/exec-adaptor.xml =================================================================== --- scripts/exec-adaptor.xml (revision 542462) +++ scripts/exec-adaptor.xml (working copy) @@ -15,8 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - Index: scripts/framework.xml =================================================================== --- scripts/framework.xml (revision 542462) +++ scripts/framework.xml (working copy) @@ -15,8 +15,6 @@ See the License for the specific language governing permissions and limitations under the License. --> - - - - - - + + - + + depends="load-depends, define-tasks, load-suites-configuration, + load-parameters, -delete-temporal-properties"/> + + + + + + + + + + + + + ... +------ +ERROR: Could not found adaptor for '@{suite}' test suite. +------ +Please, check the names specified by test.suites property: + test.suites=${test.suites} + + + + + + - - - + + + + + + + + + + + + + + + + - + @@ -75,15 +112,6 @@ - - - - - - - - - @@ -141,7 +169,7 @@ - + @@ -196,8 +224,8 @@ - - + + @@ -217,30 +245,39 @@ - - - - + + + + + + + + + + + + + - + - + - + properties got from the file --> + @@ -252,10 +289,8 @@ replace="\1.parameters.required.\2" override="true" /> - - - + @@ -271,9 +306,9 @@ and it's backed up into ${backup.parameters.location} file. - - -@{preset}=${tmp.param.value} + + @@ -290,35 +325,11 @@ - - - - - - - - - - - - + + # # Required Parameters Settings File # @@ -341,61 +352,62 @@ # - + + + + + + - - - - + + + + + + - - - # ${R-EQUIRED.@{required}.description} - - - - - - - - - - - + + + - @{required}= - + -------- WARNING: The value of the Required Parameter --------- @{required} +-------- ${tmp.short.param.key} was not set! Please, update Required Parameters Settings File: ${required.parameters.location} - - + - - @{required}=${tmp.param.value} - + + + + ... ------ ERROR: Some of the Required Parameters for selected Test Suites: @@ -403,8 +415,7 @@ were not set. Please, update Requirted Parameters Settings File: ${required.parameters.location} - - + @@ -443,8 +454,9 @@ + depends="init-framework, + load-required-parameters, save-required-parameters, + define-suites-ids, -delete-temporal-properties"/> @@ -482,6 +494,7 @@ + @@ -839,6 +852,7 @@ + @@ -861,39 +875,181 @@ - + + + + + + + + + + + + + - - - - + + + - Check for @{property} pointing to '${@{property}}' file - - - - - + + + + ... +------ +ERROR: While SVN path creation +------ ${tmp.relative.path} +for BTI workspace: + ${root.dir} +the following error has occured: +------ +${tmp.svn-make-path.failure} +------ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - &nullFilePointerMessage; - - - - - - + + + + + + + - &unexistingFilePointerMessage; - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: buildtest.dtd =================================================================== --- buildtest.dtd (revision 542462) +++ buildtest.dtd (working copy) @@ -1,71 +0,0 @@ - - - - - - - - - - ant install - -first. -&messageSuffix; -"> - - - - -idx.1] -"> - -idx.2] -"> - ant adaptor.xml update - : updates the test suite (svn co, download from external - sources, unzipping and so on - everything connected with - external fetching) - #> ant adaptor.xml setup - : do setup work for selected test suites (all the needed - configuration properties were set up during step 4.) - #> ant adaptor.xml run - : run the test suite with specified configuration - properties. - #> ant adaptor.xml publish - : publich expected results (built product, test results) - to the specified place. - [>idx.3] -"> Index: adaptors/tomcat-scenario/adaptor.xml =================================================================== --- adaptors/tomcat-scenario/adaptor.xml (revision 542462) +++ adaptors/tomcat-scenario/adaptor.xml (working copy) @@ -44,6 +44,11 @@ + + + - - + + + - - + + - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - &installDocumentation; - - - - --> - - - - - - - - - - - - - - - - &installationFailureMessage; - - - - - &setupDocumentation; + + + + + + + # +# Any BTI framework local configuration properties +# should be specified in this file. +# For more information on which parameters can be configured see +# ${scripts.dir}/parameters.xml + - - &runDocumentation; - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -