litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge revisions 2194 and 2195 from the trunk.

Browse source
This commit is contained in:
jeb228 2011-01-14 23:11:29 +00:00
parent c5fa8d4bce
commit 7bc67dd008
2 changed files with 16 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
utilities/load-testing/build.xml
View file

@ -32,7 +32,7 @@ report - Just summarize output from previously run tests.
target: all target: all
================================= --> ================================= -->
<target name="all" <target name="all"
depends="clean, run, report" depends="run, report"
description="--> Run the tests and summarize the output." /> description="--> Run the tests and summarize the output." />
<!-- ================================= <!-- =================================
@ -51,8 +51,6 @@ report - Just summarize output from previously run tests.
<property name="source.dir" value="src" /> <property name="source.dir" value="src" />
<property name="build.dir" value=".build" /> <property name="build.dir" value=".build" />
<property name="tests.dir" value="tests" /> <property name="tests.dir" value="tests" />
<property name="results.dir" value=".results" />
<property name="properties.file" location="loadtesting.properties" /> <property name="properties.file" location="loadtesting.properties" />
<fail message="You must create a &quot;${properties.file}&quot; file."> <fail message="You must create a &quot;${properties.file}&quot; file.">
@ -79,6 +77,9 @@ report - Just summarize output from previously run tests.
<fail unless="data.dir" message="${properties.file} must contain a value for data.dir" /> <fail unless="data.dir" message="${properties.file} must contain a value for data.dir" />
<!-- If no value was provided, store the results here. -->
<property name="results.dir" value=".results" />
<!-- If no value was provided, run a single thread --> <!-- If no value was provided, run a single thread -->
<property name="threads" value="1" /> <property name="threads" value="1" />

19
utilities/load-testing/tests/SecondTests-rel-1-1-1.jmx
View file

@ -9,32 +9,37 @@
<collectionProp name="Arguments.arguments"> <collectionProp name="Arguments.arguments">
<elementProp name="WEBAPP_HOST" elementType="Argument"> <elementProp name="WEBAPP_HOST" elementType="Argument">
<stringProp name="Argument.name">WEBAPP_HOST</stringProp> <stringProp name="Argument.name">WEBAPP_HOST</stringProp>
<stringProp name="Argument.value">${__property(webapp.host, localhost)}</stringProp> <stringProp name="Argument.value">${__property(webapp.host, , localhost)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp> <stringProp name="Argument.metadata">=</stringProp>
</elementProp> </elementProp>
<elementProp name="WEBAPP_PORT" elementType="Argument"> <elementProp name="WEBAPP_PORT" elementType="Argument">
<stringProp name="Argument.name">WEBAPP_PORT</stringProp> <stringProp name="Argument.name">WEBAPP_PORT</stringProp>
<stringProp name="Argument.value">${__property(webapp.port, 8080)}</stringProp> <stringProp name="Argument.value">${__property(webapp.port, , 8080)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp> <stringProp name="Argument.metadata">=</stringProp>
</elementProp> </elementProp>
<elementProp name="WEBAPP_NAME" elementType="Argument"> <elementProp name="WEBAPP_NAME" elementType="Argument">
<stringProp name="Argument.name">WEBAPP_NAME</stringProp> <stringProp name="Argument.name">WEBAPP_NAME</stringProp>
<stringProp name="Argument.value">${__property(webapp.name, vivo)}</stringProp> <stringProp name="Argument.value">${__property(webapp.name, , vivo)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp> <stringProp name="Argument.metadata">=</stringProp>
</elementProp> </elementProp>
<elementProp name="PERSON_URI_FILE" elementType="Argument"> <elementProp name="PERSON_URI_FILE" elementType="Argument">
<stringProp name="Argument.name">PERSON_URI_FILE</stringProp> <stringProp name="Argument.name">PERSON_URI_FILE</stringProp>
<stringProp name="Argument.value">${__property(file.person.uris, PersonUris.csv)}</stringProp> <stringProp name="Argument.value">${__property(file.person.uris, , PersonUris.csv)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp> <stringProp name="Argument.metadata">=</stringProp>
</elementProp> </elementProp>
<elementProp name="INFO_RESOURCE_URI_FILE" elementType="Argument"> <elementProp name="INFO_RESOURCE_URI_FILE" elementType="Argument">
<stringProp name="Argument.name">INFO_RESOURCE_URI_FILE</stringProp> <stringProp name="Argument.name">INFO_RESOURCE_URI_FILE</stringProp>
<stringProp name="Argument.value">${__property(file.infoResource.uris, InfoResourceUris.csv)}</stringProp> <stringProp name="Argument.value">${__property(file.infoResource.uris, , InfoResourceUris.csv)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp> <stringProp name="Argument.metadata">=</stringProp>
</elementProp> </elementProp>
<elementProp name="ITERATIONS" elementType="Argument"> <elementProp name="ITERATIONS" elementType="Argument">
<stringProp name="Argument.name">ITERATIONS</stringProp> <stringProp name="Argument.name">ITERATIONS</stringProp>
<stringProp name="Argument.value">${__property(iterations, 10)}</stringProp> <stringProp name="Argument.value">${__property(iterations, , 10)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp>
</elementProp>
<elementProp name="THREADS" elementType="Argument">
<stringProp name="Argument.name">THREADS</stringProp>
<stringProp name="Argument.value">${__property(threads, , 1)}</stringProp>
<stringProp name="Argument.metadata">=</stringProp> <stringProp name="Argument.metadata">=</stringProp>
</elementProp> </elementProp>
</collectionProp> </collectionProp>
@ -48,7 +53,7 @@
<boolProp name="LoopController.continue_forever">false</boolProp> <boolProp name="LoopController.continue_forever">false</boolProp>
<stringProp name="LoopController.loops">${ITERATIONS}</stringProp> <stringProp name="LoopController.loops">${ITERATIONS}</stringProp>
</elementProp> </elementProp>
<stringProp name="ThreadGroup.num_threads">1</stringProp> <stringProp name="ThreadGroup.num_threads">${THREADS}</stringProp>
<stringProp name="ThreadGroup.ramp_time">1</stringProp> <stringProp name="ThreadGroup.ramp_time">1</stringProp>
<longProp name="ThreadGroup.start_time">1294759350000</longProp> <longProp name="ThreadGroup.start_time">1294759350000</longProp>
<longProp name="ThreadGroup.end_time">1294759350000</longProp> <longProp name="ThreadGroup.end_time">1294759350000</longProp>