1.1 --- a/make/build-benchmark.xml Fri May 24 23:27:52 2013 +0530 1.2 +++ b/make/build-benchmark.xml Mon May 27 13:11:13 2013 +0200 1.3 @@ -32,250 +32,263 @@ 1.4 <pathconvert pathsep=" " property="octane-tests" refid="octane-set"/> 1.5 </target> 1.6 1.7 + 1.8 <!-- box2d --> 1.9 <target name="octane-box2d" depends="jar"> 1.10 <antcall target="run-octane"> 1.11 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/box2d.js"/> 1.12 + <param name="octane-tests" value="box2d"/> 1.13 </antcall> 1.14 </target> 1.15 1.16 <target name="octane-box2d-v8" depends="jar"> 1.17 <antcall target="run-octane-v8"> 1.18 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/box2d.js"/> 1.19 + <param name="octane-tests" value="box2d"/> 1.20 </antcall> 1.21 </target> 1.22 1.23 <target name="octane-box2d-rhino" depends="jar"> 1.24 <antcall target="run-octane-rhino"> 1.25 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/box2d.js"/> 1.26 + <param name="octane-tests" value="box2d"/> 1.27 </antcall> 1.28 </target> 1.29 1.30 + 1.31 <!-- code-load --> 1.32 <target name="octane-code-load" depends="jar"> 1.33 <antcall target="run-octane"> 1.34 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/code-load.js"/> 1.35 + <param name="octane-tests" value="code-load"/> 1.36 </antcall> 1.37 </target> 1.38 1.39 <target name="octane-code-load-v8" depends="jar"> 1.40 <antcall target="run-octane-v8"> 1.41 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/code-load.js"/> 1.42 + <param name="octane-tests" value="code-load"/> 1.43 </antcall> 1.44 </target> 1.45 1.46 <target name="octane-code-load-rhino" depends="jar"> 1.47 <antcall target="run-octane-rhino"> 1.48 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/code-load.js"/> 1.49 + <param name="octane-tests" value="code-load"/> 1.50 </antcall> 1.51 </target> 1.52 1.53 + 1.54 <!-- crypto --> 1.55 <target name="octane-crypto" depends="jar"> 1.56 <antcall target="run-octane"> 1.57 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/crypto.js"/> 1.58 + <param name="octane-tests" value="crypto"/> 1.59 </antcall> 1.60 </target> 1.61 1.62 <target name="octane-crypto-v8" depends="jar"> 1.63 <antcall target="run-octane-v8"> 1.64 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/crypto.js"/> 1.65 + <param name="octane-tests" value="crypto"/> 1.66 </antcall> 1.67 </target> 1.68 1.69 <target name="octane-crypto-rhino" depends="jar"> 1.70 <antcall target="run-octane-rhino"> 1.71 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/crypto.js"/> 1.72 + <param name="octane-tests" value="crypto"/> 1.73 </antcall> 1.74 </target> 1.75 1.76 + 1.77 <!-- deltablue --> 1.78 <target name="octane-deltablue" depends="jar"> 1.79 <antcall target="run-octane"> 1.80 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/deltablue.js"/> 1.81 + <param name="octane-tests" value="deltablue"/> 1.82 </antcall> 1.83 </target> 1.84 1.85 <target name="octane-deltablue-v8" depends="jar"> 1.86 <antcall target="run-octane-v8"> 1.87 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/deltablue.js"/> 1.88 + <param name="octane-tests" value="deltablue"/> 1.89 </antcall> 1.90 </target> 1.91 1.92 <target name="octane-deltablue-rhino" depends="jar"> 1.93 <antcall target="run-octane-rhino"> 1.94 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/deltablue.js"/> 1.95 + <param name="octane-tests" value="deltablue"/> 1.96 </antcall> 1.97 </target> 1.98 1.99 + 1.100 <!-- earley-boyer --> 1.101 <target name="octane-earley-boyer" depends="jar"> 1.102 <antcall target="run-octane"> 1.103 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/earley-boyer.js"/> 1.104 + <param name="octane-tests" value="earley-boyer"/> 1.105 </antcall> 1.106 </target> 1.107 1.108 <target name="octane-earley-boyer-v8" depends="jar"> 1.109 <antcall target="run-octane-v8"> 1.110 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/earley-boyer.js"/> 1.111 + <param name="octane-tests" value="earley-boyer"/> 1.112 </antcall> 1.113 </target> 1.114 1.115 <target name="octane-earley-boyer-rhino" depends="jar"> 1.116 <antcall target="run-octane-rhino"> 1.117 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/earley-boyer.js"/> 1.118 + <param name="octane-tests" value="earley-boyer"/> 1.119 </antcall> 1.120 </target> 1.121 1.122 + 1.123 <!-- gbemu --> 1.124 <target name="octane-gbemu" depends="jar"> 1.125 <antcall target="run-octane"> 1.126 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/gbemu.js"/> 1.127 + <param name="octane-tests" value="gbemu"/> 1.128 </antcall> 1.129 </target> 1.130 1.131 <target name="octane-gbemu-v8" depends="jar"> 1.132 <antcall target="run-octane-v8"> 1.133 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/gbemu.js"/> 1.134 + <param name="octane-tests" value="gbemu"/> 1.135 </antcall> 1.136 </target> 1.137 1.138 <target name="octane-gbemu-rhino" depends="jar"> 1.139 <antcall target="run-octane-rhino"> 1.140 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/gbemu.js"/> 1.141 + <param name="octane-tests" value="gbemu"/> 1.142 </antcall> 1.143 </target> 1.144 1.145 + 1.146 <!-- mandreel --> 1.147 <target name="octane-mandreel" depends="jar"> 1.148 <antcall target="run-octane"> 1.149 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/mandreel.js"/> 1.150 + <param name="octane-tests" value="mandreel"/> 1.151 </antcall> 1.152 </target> 1.153 1.154 <target name="octane-mandreel-v8" depends="jar"> 1.155 <antcall target="run-octane-v8"> 1.156 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/mandreel.js"/> 1.157 + <param name="octane-tests" value="mandreel"/> 1.158 </antcall> 1.159 </target> 1.160 1.161 <target name="octane-mandreel-rhino" depends="jar"> 1.162 <antcall target="run-octane-rhino"> 1.163 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/mandreel.js"/> 1.164 + <param name="octane-tests" value="mandreel"/> 1.165 </antcall> 1.166 </target> 1.167 1.168 + 1.169 <!-- navier-stokes --> 1.170 <target name="octane-navier-stokes" depends="jar"> 1.171 <antcall target="run-octane"> 1.172 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/navier-stokes.js"/> 1.173 + <param name="octane-tests" value="navier-stokes"/> 1.174 </antcall> 1.175 </target> 1.176 1.177 <target name="octane-navier-stokes-v8" depends="jar"> 1.178 <antcall target="run-octane-v8"> 1.179 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/navier-stokes.js"/> 1.180 + <param name="octane-tests" value="navier-stokes"/> 1.181 </antcall> 1.182 </target> 1.183 1.184 <target name="octane-navier-stokes-rhino" depends="jar"> 1.185 <antcall target="run-octane-rhino"> 1.186 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/navier-stokes.js"/> 1.187 + <param name="octane-tests" value="navier-stokes"/> 1.188 </antcall> 1.189 </target> 1.190 1.191 + 1.192 <!-- pdfjs --> 1.193 <target name="octane-pdfjs" depends="jar"> 1.194 <antcall target="run-octane"> 1.195 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/pdfjs.js"/> 1.196 + <param name="octane-tests" value="pdfjs"/> 1.197 </antcall> 1.198 </target> 1.199 1.200 <target name="octane-pdfjs-v8" depends="jar"> 1.201 <antcall target="run-octane-v8"> 1.202 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/pdfjs.js"/> 1.203 + <param name="octane-tests" value="pdfjs"/> 1.204 </antcall> 1.205 </target> 1.206 1.207 <target name="octane-pdfjs-rhino" depends="jar"> 1.208 <antcall target="run-octane-rhino"> 1.209 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/pdfjs.js"/> 1.210 + <param name="octane-tests" value="pdfjs"/> 1.211 </antcall> 1.212 </target> 1.213 1.214 + 1.215 <!-- raytrace --> 1.216 <target name="octane-raytrace" depends="jar"> 1.217 <antcall target="run-octane"> 1.218 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/raytrace.js"/> 1.219 + <param name="octane-tests" value="raytrace"/> 1.220 </antcall> 1.221 </target> 1.222 1.223 <target name="octane-raytrace-v8" depends="jar"> 1.224 <antcall target="run-octane-v8"> 1.225 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/raytrace.js"/> 1.226 + <param name="octane-tests" value="raytrace"/> 1.227 </antcall> 1.228 </target> 1.229 1.230 <target name="octane-raytrace-rhino" depends="jar"> 1.231 <antcall target="run-octane-rhino"> 1.232 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/raytrace.js"/> 1.233 + <param name="octane-tests" value="raytrace"/> 1.234 </antcall> 1.235 </target> 1.236 1.237 + 1.238 <!-- regexp --> 1.239 <target name="octane-regexp" depends="jar"> 1.240 <antcall target="run-octane"> 1.241 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/regexp.js"/> 1.242 + <param name="octane-tests" value="regexp"/> 1.243 </antcall> 1.244 </target> 1.245 1.246 <target name="octane-regexp-octane-v8" depends="jar"> 1.247 <antcall target="run-octane-v8"> 1.248 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/regexp.js"/> 1.249 + <param name="octane-tests" value="regexp"/> 1.250 </antcall> 1.251 </target> 1.252 1.253 <target name="octane-regexp-rhino" depends="jar"> 1.254 <antcall target="run-octane-rhino"> 1.255 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/regexp.js"/> 1.256 + <param name="octane-tests" value="regexp"/> 1.257 </antcall> 1.258 </target> 1.259 1.260 + 1.261 <!-- richards --> 1.262 <target name="octane-richards" depends="jar"> 1.263 <antcall target="run-octane"> 1.264 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/richards.js"/> 1.265 + <param name="octane-tests" value="richards"/> 1.266 </antcall> 1.267 </target> 1.268 1.269 <target name="octane-richards-v8" depends="jar"> 1.270 <antcall target="run-octane-v8"> 1.271 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/richards.js"/> 1.272 + <param name="octane-tests" value="richards"/> 1.273 </antcall> 1.274 </target> 1.275 1.276 <target name="octane-richards-rhino" depends="jar"> 1.277 <antcall target="run-octane-rhino"> 1.278 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/richards.js"/> 1.279 + <param name="octane-tests" value="richards"/> 1.280 </antcall> 1.281 </target> 1.282 1.283 + 1.284 <!-- splay --> 1.285 <target name="octane-splay" depends="jar"> 1.286 <antcall target="run-octane"> 1.287 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/splay.js"/> 1.288 + <param name="octane-tests" value="splay"/> 1.289 </antcall> 1.290 </target> 1.291 1.292 <target name="octane-splay-v8" depends="jar"> 1.293 <antcall target="run-octane-v8"> 1.294 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/splay.js"/> 1.295 + <param name="octane-tests" value="splay"/> 1.296 </antcall> 1.297 </target> 1.298 1.299 <target name="octane-splay-rhino" depends="jar"> 1.300 <antcall target="run-octane-rhino"> 1.301 - <param name="octane-tests" value="${octane-test-sys-prop.test.js.roots}/splay.js"/> 1.302 + <param name="octane-tests" value="splay"/> 1.303 </antcall> 1.304 </target> 1.305