Skip to content

Commit 7139df0

Browse files
sigmundchcommit-bot@chromium.org
authored andcommitted
Add strong sections to language_2 and corelib_2, and change to run dart2js in
strong mode for those two suites Bug: Change-Id: I5e7b07c9497afd9f9f65fd0de609d5587d3bd9f1 Reviewed-on: https://dart-review.googlesource.com/33120 Reviewed-by: Emily Fortuna <[email protected]> Commit-Queue: Sigmund Cherem <[email protected]>
1 parent 0fb2d0b commit 7139df0

File tree

4 files changed

+683
-48
lines changed

4 files changed

+683
-48
lines changed

pkg/compiler/tool/status_files/update_all.sh

Lines changed: 29 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,9 @@ for arg in "$@"; do
1616
--with-fast-startup|--fast-startup)
1717
fast_startup=true
1818
;;
19+
--strong)
20+
strong=true
21+
;;
1922
--with-checked-mode|--checked-mode|--checked)
2023
checked_mode=true
2124
;;
@@ -31,7 +34,11 @@ for arg in "$@"; do
3134
done
3235

3336
if [ -z "$suites" ]; then
34-
suites="dart2js_native dart2js_extra language language_2 corelib corelib_2 html"
37+
if [[ "$strong" == true ]]; then
38+
suites="language_2 corelib_2"
39+
else
40+
suites="dart2js_native dart2js_extra language corelib html"
41+
fi
3542
fi
3643

3744
repodir=$(cd $(dirname ${BASH_SOURCE[0]})/../../../../; pwd)
@@ -41,46 +48,37 @@ binaries_dir=out/ReleaseX64
4148

4249
tmp=$(mktemp -d)
4350

51+
function update_suite_with_flags {
52+
local name=$1
53+
local suite=$2
54+
shift 2
55+
local args=$@
56+
if [[ "$strong" == true ]]; then
57+
name="$name-strong"
58+
args="--strong $args"
59+
fi
60+
61+
echo " - $name tests"
62+
./tools/test.py -m release -c dart2js -r $runtime --dart2js-batch \
63+
--dart2js-with-kernel $args $suite > $tmp/$suite-$name.txt
64+
echo $tmp/$suite-$name.txt
65+
$dart $update_script $name $tmp/$suite-$name.txt
66+
}
67+
4468
function update_suite {
4569
local suite=$1
4670
local runtime="d8"
4771
if [ "$suite" == "html" ]; then
4872
runtime="drt"
4973
fi
5074
echo -e "\nupdate suite: $suite"
51-
echo " - minified tests"
52-
./tools/test.py -m release -c dart2js -r $runtime --dart2js-batch \
53-
--use-sdk --minified --dart2js-with-kernel \
54-
$suite > $tmp/$suite-minified.txt
55-
$dart $update_script minified $tmp/$suite-minified.txt
56-
57-
58-
echo " - host-checked tests"
59-
./tools/test.py -m release -c dart2js -r $runtime --dart2js-batch \
60-
--host-checked \
61-
--dart2js-options="--platform-binaries=$binaries_dir" \
62-
--dart2js-with-kernel \
63-
$suite > $tmp/$suite-host-checked.txt
64-
$dart $update_script host-checked $tmp/$suite-host-checked.txt
65-
75+
update_suite_with_flags minified $suite "--minified --use-sdk"
76+
update_suite_with_flags host-checked $suite "--host-checked"
6677
if [ "$fast_startup" = true ]; then
67-
echo " - fast-startup tests"
68-
./tools/test.py -m release -c dart2js -r $runtime --dart2js-batch \
69-
--fast-startup \
70-
--dart2js-options="--platform-binaries=$binaries_dir" \
71-
--dart2js-with-kernel \
72-
$suite > $tmp/$suite-fast-startup.txt
73-
$dart $update_script fast-startup $tmp/$suite-fast-startup.txt
78+
update_suite_with_flags fast-startup $suite "--fast-startup"
7479
fi
75-
7680
if [ "$checked_mode" = true ]; then
77-
echo " - checked mode tests"
78-
./tools/test.py -m release -c dart2js -r $runtime --dart2js-batch \
79-
--checked \
80-
--dart2js-options="--platform-binaries=$binaries_dir" \
81-
--dart2js-with-kernel \
82-
$suite > $tmp/$suite-checked-mode.txt
83-
$dart $update_script checked-mode $tmp/$suite-checked-mode.txt
81+
update_suite_with_flags checked-mode $suite "--checked"
8482
fi
8583
}
8684

pkg/compiler/tool/status_files/update_from_log.dart

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,10 +33,18 @@ final dart2jsConfigurations = {
3333
'host-checked':
3434
r'[ $compiler == dart2js && $dart2js_with_kernel && $host_checked ]',
3535
'minified': r'[ $compiler == dart2js && $dart2js_with_kernel && $minified ]',
36+
'host-checked-strong':
37+
r'[ $compiler == dart2js && $dart2js_with_kernel && $host_checked && $strong ]',
38+
'minified-strong':
39+
r'[ $compiler == dart2js && $dart2js_with_kernel && $minified && $strong ]',
3640
'fast-startup':
3741
r'[ $compiler == dart2js && $dart2js_with_kernel && $fast_startup ]',
42+
'fast-startup-strong':
43+
r'[ $compiler == dart2js && $dart2js_with_kernel && $fast_startup && $strong ]',
3844
'checked-mode':
3945
r'[ $compiler == dart2js && $checked && $dart2js_with_kernel ]',
46+
'checked-mode-strong':
47+
r'[ $compiler == dart2js && $checked && $dart2js_with_kernel && $strong ]',
4048
};
4149

4250
final dart2jsStatusFiles = {

tests/corelib_2/corelib_2.status

Lines changed: 22 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,7 @@ string_trimlr_test/02: RuntimeError # Uses Unicode 6.2.0 or earlier.
215215
[ $compiler == dart2js && !$browser ]
216216
package_resource_test: RuntimeError # Issue 26842
217217

218-
[ $compiler == dart2js && $checked && $dart2js_with_kernel ]
218+
[ $compiler == dart2js && $checked && $dart2js_with_kernel && $strong ]
219219
apply3_test: RuntimeError
220220
error_stack_trace1_test: RuntimeError # Issue 12399
221221
from_environment_const_type_test/02: MissingCompileTimeError
@@ -250,11 +250,14 @@ symbol_reserved_word_test/10: MissingCompileTimeError
250250
symbol_test/02: MissingCompileTimeError
251251
symbol_test/03: MissingCompileTimeError
252252

253+
[ $compiler == dart2js && $checked && $dart2js_with_kernel && !$strong ]
254+
*: SkipByDesign
255+
253256
[ $compiler == dart2js && $dart2js_with_kernel ]
254257
int_from_environment_test: Pass # Issue 31762
255258
int_parse_radix_test/none: Pass # Issue 31762
256259

257-
[ $compiler == dart2js && $dart2js_with_kernel && $fast_startup ]
260+
[ $compiler == dart2js && $dart2js_with_kernel && $fast_startup && $strong ]
258261
iterable_return_type_test/01: RuntimeError
259262
iterable_return_type_test/02: RuntimeError
260263
iterable_to_list_test/01: RuntimeError
@@ -270,15 +273,21 @@ symbol_test/02: MissingCompileTimeError
270273
symbol_test/03: MissingCompileTimeError
271274
uri_base_test: Crash # RangeError (index): Invalid value: Valid value range is empty: 0
272275

273-
[ $compiler == dart2js && $dart2js_with_kernel && $host_checked ]
276+
[ $compiler == dart2js && $dart2js_with_kernel && $fast_startup && !$strong ]
277+
*: SkipByDesign
278+
279+
[ $compiler == dart2js && $dart2js_with_kernel && $host_checked && $strong ]
274280
apply3_test: RuntimeError
281+
cast_test: RuntimeError
275282
error_stack_trace1_test: RuntimeError # Issue 12399
276283
iterable_return_type_test/01: RuntimeError
277284
iterable_return_type_test/02: RuntimeError
278285
iterable_to_list_test/01: RuntimeError
279286
list_test/01: Crash # Unsupported operation: Unsupported type parameter type node T.
280287
list_test/none: Crash # Unsupported operation: Unsupported type parameter type node T.
281288
map_test: Crash # type 'DillClassBuilder' is not a subtype of type 'SourceClassBuilder' of 'named' where
289+
null_nosuchmethod_test/01: RuntimeError
290+
null_nosuchmethod_test/none: RuntimeError
282291
symbol_reserved_word_test/03: RuntimeError
283292
symbol_reserved_word_test/04: MissingCompileTimeError
284293
symbol_reserved_word_test/05: MissingCompileTimeError
@@ -287,8 +296,12 @@ symbol_reserved_word_test/10: MissingCompileTimeError
287296
symbol_test/02: MissingCompileTimeError
288297
symbol_test/03: MissingCompileTimeError
289298

290-
[ $compiler == dart2js && $dart2js_with_kernel && $minified ]
299+
[ $compiler == dart2js && $dart2js_with_kernel && $host_checked && !$strong ]
300+
*: SkipByDesign
301+
302+
[ $compiler == dart2js && $dart2js_with_kernel && $minified && $strong ]
291303
apply3_test: RuntimeError
304+
cast_test: RuntimeError
292305
dynamic_nosuchmethod_test: RuntimeError
293306
error_stack_trace1_test: RuntimeError
294307
hash_set_test/01: Crash # Assertion failure: Cannot find value Instance of 'ThisLocal' in (local(_CustomHashSet.#x), local(_CustomHashSet.#)) for j:closure_call(_CustomHashSet__CustomHashSet_closure.call).
@@ -301,6 +314,8 @@ iterable_to_set_test: Crash # Assertion failure: Cannot find value Instance of '
301314
list_test/01: Crash # Unsupported operation: Unsupported type parameter type node T.
302315
list_test/none: Crash # Unsupported operation: Unsupported type parameter type node T.
303316
map_test: Crash # tests/map_test.dart:870:7: Internal problem: Unhandled Null in installDefaultConstructor.
317+
null_nosuchmethod_test/01: RuntimeError
318+
null_nosuchmethod_test/none: RuntimeError
304319
splay_tree_from_iterable_test: Crash # Assertion failure: Cannot find value Instance of 'ThisLocal' in (local(SplayTreeMap.#v), local(SplayTreeMap.#)) for j:closure_call(SplayTreeMap_SplayTreeMap_closure.call).
305320
splay_tree_test/01: Crash # Assertion failure: Cannot find value Instance of 'ThisLocal' in (local(SplayTreeSet.#v), local(SplayTreeSet.#)) for j:closure_call(SplayTreeSet_SplayTreeSet_closure.call).
306321
splay_tree_test/02: Crash # Assertion failure: Cannot find value Instance of 'ThisLocal' in (local(SplayTreeSet.#v), local(SplayTreeSet.#)) for j:closure_call(SplayTreeSet_SplayTreeSet_closure.call).
@@ -315,6 +330,9 @@ symbol_test/02: MissingCompileTimeError
315330
symbol_test/03: MissingCompileTimeError
316331
uri_base_test: Crash # RangeError (index): Invalid value: Valid value range is empty: 0
317332

333+
[ $compiler == dart2js && $dart2js_with_kernel && $minified && !$strong ]
334+
*: SkipByDesign
335+
318336
[ $compiler == dart2js && !$dart2js_with_kernel ]
319337
iterable_return_type_test/01: RuntimeError # Issue 20085
320338
iterable_return_type_test/02: RuntimeError # Dart2js does not support Uint64*.

0 commit comments

Comments
 (0)