diff options
author | teravus | 2012-11-15 10:05:16 -0500 |
---|---|---|
committer | teravus | 2012-11-15 10:05:16 -0500 |
commit | e9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch) | |
tree | bc111d34f95a26b99c7e34d9e495dc14d1802cc3 /.nant | |
parent | Merge master into teravuswork (diff) | |
download | opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC_OLD-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz |
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
Diffstat (limited to '')
-rw-r--r-- | .nant/local.include | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/.nant/local.include b/.nant/local.include index 35f0058..6d3e972 100644 --- a/.nant/local.include +++ b/.nant/local.include | |||
@@ -135,25 +135,14 @@ | |||
135 | <delete dir="%temp%"/> | 135 | <delete dir="%temp%"/> |
136 | </target> | 136 | </target> |
137 | 137 | ||
138 | <target name="test-stress" depends="build, find-nunit"> | 138 | <target name="torture" depends="build, find-nunit"> |
139 | <setenv name="MONO_THREADS_PER_CPU" value="100" /> | 139 | <setenv name="MONO_THREADS_PER_CPU" value="100" /> |
140 | 140 | ||
141 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.stress"> | 141 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.torture"> |
142 | <arg value="./bin/OpenSim.Tests.Stress.dll" /> | 142 | <arg value="./bin/OpenSim.Tests.Torture.dll" /> |
143 | </exec> | 143 | </exec> |
144 | 144 | ||
145 | <fail message="Failures reported in stress tests." unless="${int::parse(testresult.opensim.tests.stress)==0}" /> | 145 | <fail message="Failures reported in unit tests." unless="${int::parse(testresult.opensim.tests.torture)==0}" /> |
146 | <delete dir="%temp%"/> | ||
147 | </target> | ||
148 | |||
149 | <target name="test-perf" depends="build, find-nunit"> | ||
150 | <setenv name="MONO_THREADS_PER_CPU" value="100" /> | ||
151 | |||
152 | <exec program="${nunitcmd}" failonerror="true" resultproperty="testresult.opensim.tests.performance"> | ||
153 | <arg value="./bin/OpenSim.Tests.Performance.dll" /> | ||
154 | </exec> | ||
155 | |||
156 | <fail message="Failures reported in performance tests." unless="${int::parse(testresult.opensim.tests.performance)==0}" /> | ||
157 | <delete dir="%temp%"/> | 146 | <delete dir="%temp%"/> |
158 | </target> | 147 | </target> |
159 | 148 | ||