Bug 735549 - Generate the JS reftest suite's manifests automatically; r=dmandelin
authorTerrence Cole <terrence@mozilla.com>
Thu, 22 Mar 2012 18:52:12 -0700
changeset 91802 61189954ca171da5767152658c8040dcd4639bfe
parent 91801 af7a735a2d9ed73696ed6c99d5fb9952c838eb40
child 91803 0d0ac6a97737209b487ba276b97f3d102363603d
push id1
push userroot
push dateMon, 20 Oct 2014 17:29:22 +0000
reviewersdmandelin
bugs735549
milestone14.0a1
Bug 735549 - Generate the JS reftest suite's manifests automatically; r=dmandelin
js/src/tests/Makefile.in
js/src/tests/README.txt
js/src/tests/e4x/Expressions/11.1.4-08.js
js/src/tests/e4x/Expressions/jstests.list
js/src/tests/e4x/GC/jstests.list
js/src/tests/e4x/GC/regress-280844-1.js
js/src/tests/e4x/GC/regress-280844-2.js
js/src/tests/e4x/GC/regress-292455.js
js/src/tests/e4x/GC/regress-324278.js
js/src/tests/e4x/Global/13.1.2.1.js
js/src/tests/e4x/Global/jstests.list
js/src/tests/e4x/Namespace/jstests.list
js/src/tests/e4x/Namespace/regress-292863.js
js/src/tests/e4x/QName/jstests.list
js/src/tests/e4x/Regress/jstests.list
js/src/tests/e4x/Regress/regress-278112.js
js/src/tests/e4x/Regress/regress-308111.js
js/src/tests/e4x/Regress/regress-319872.js
js/src/tests/e4x/Regress/regress-350238.js
js/src/tests/e4x/Regress/regress-361451.js
js/src/tests/e4x/Regress/regress-394941.js
js/src/tests/e4x/Regress/regress-458679-01.js
js/src/tests/e4x/Regress/regress-458679-02.js
js/src/tests/e4x/Regress/regress-473709.js
js/src/tests/e4x/Regress/regress-474319.js
js/src/tests/e4x/Statements/jstests.list
js/src/tests/e4x/TypeConversion/10.2.1.js
js/src/tests/e4x/TypeConversion/10.5.1.js
js/src/tests/e4x/TypeConversion/10.5.js
js/src/tests/e4x/TypeConversion/10.6.1.js
js/src/tests/e4x/TypeConversion/10.6.js
js/src/tests/e4x/TypeConversion/jstests.list
js/src/tests/e4x/Types/9.1.1.10.js
js/src/tests/e4x/Types/9.1.1.11.js
js/src/tests/e4x/Types/9.1.1.12.js
js/src/tests/e4x/Types/9.1.1.13.js
js/src/tests/e4x/Types/9.1.1.4.js
js/src/tests/e4x/Types/9.1.1.5.js
js/src/tests/e4x/Types/9.1.1.7.js
js/src/tests/e4x/Types/9.1.1.8.js
js/src/tests/e4x/Types/9.2.1.10.js
js/src/tests/e4x/Types/9.2.1.3.js
js/src/tests/e4x/Types/9.2.1.4.js
js/src/tests/e4x/Types/9.2.1.5.js
js/src/tests/e4x/Types/9.2.1.6.js
js/src/tests/e4x/Types/9.2.1.7.js
js/src/tests/e4x/Types/jstests.list
js/src/tests/e4x/XML/13.4.4.1.js
js/src/tests/e4x/XML/jstests.list
js/src/tests/e4x/XML/regress-324422-1.js
js/src/tests/e4x/XML/regress-324422-2.js
js/src/tests/e4x/XML/regress-324688.js
js/src/tests/e4x/XMLList/jstests.list
js/src/tests/e4x/decompilation/decompile-xml-escapes.js
js/src/tests/e4x/decompilation/jstests.list
js/src/tests/e4x/decompilation/regress-373678.js
js/src/tests/e4x/decompilation/regress-429249.js
js/src/tests/e4x/extensions/assign-to-xml.js
js/src/tests/e4x/extensions/jstests.list
js/src/tests/e4x/extensions/qualified-name-expr.js
js/src/tests/e4x/jstests.list
js/src/tests/ecma/Array/jstests.list
js/src/tests/ecma/Boolean/jstests.list
js/src/tests/ecma/Date/15.9.5.12-2.js
js/src/tests/ecma/Date/15.9.5.14.js
js/src/tests/ecma/Date/15.9.5.16.js
js/src/tests/ecma/Date/15.9.5.28-1.js
js/src/tests/ecma/Date/15.9.5.29-1.js
js/src/tests/ecma/Date/15.9.5.34-1.js
js/src/tests/ecma/Date/15.9.5.35-1.js
js/src/tests/ecma/Date/15.9.5.8.js
js/src/tests/ecma/Date/15.9.5.9.js
js/src/tests/ecma/Date/dst-offset-caching-1-of-8.js
js/src/tests/ecma/Date/dst-offset-caching-2-of-8.js
js/src/tests/ecma/Date/dst-offset-caching-3-of-8.js
js/src/tests/ecma/Date/dst-offset-caching-4-of-8.js
js/src/tests/ecma/Date/dst-offset-caching-5-of-8.js
js/src/tests/ecma/Date/dst-offset-caching-6-of-8.js
js/src/tests/ecma/Date/dst-offset-caching-7-of-8.js
js/src/tests/ecma/Date/dst-offset-caching-8-of-8.js
js/src/tests/ecma/Date/jstests.list
js/src/tests/ecma/ExecutionContexts/10.2.2-1.js
js/src/tests/ecma/ExecutionContexts/10.2.2-2.js
js/src/tests/ecma/ExecutionContexts/jstests.list
js/src/tests/ecma/Expressions/jstests.list
js/src/tests/ecma/FunctionObjects/jstests.list
js/src/tests/ecma/GlobalObject/jstests.list
js/src/tests/ecma/LexicalConventions/7.4.3-3-n.js
js/src/tests/ecma/LexicalConventions/jstests.list
js/src/tests/ecma/Math/jstests.list
js/src/tests/ecma/NativeObjects/jstests.list
js/src/tests/ecma/Number/jstests.list
js/src/tests/ecma/ObjectObjects/jstests.list
js/src/tests/ecma/SourceText/jstests.list
js/src/tests/ecma/Statements/jstests.list
js/src/tests/ecma/String/jstests.list
js/src/tests/ecma/TypeConversion/jstests.list
js/src/tests/ecma/Types/jstests.list
js/src/tests/ecma/browser.js
js/src/tests/ecma/extensions/jstests.list
js/src/tests/ecma/extensions/trapflatclosure.js
js/src/tests/ecma/jstests.list
js/src/tests/ecma_2/Exceptions/jstests.list
js/src/tests/ecma_2/Exceptions/lexical-010.js
js/src/tests/ecma_2/Exceptions/lexical-022.js
js/src/tests/ecma_2/Expressions/jstests.list
js/src/tests/ecma_2/FunctionObjects/jstests.list
js/src/tests/ecma_2/LexicalConventions/jstests.list
js/src/tests/ecma_2/RegExp/exec-001.js
js/src/tests/ecma_2/RegExp/jstests.list
js/src/tests/ecma_2/Statements/forin-002.js
js/src/tests/ecma_2/Statements/jstests.list
js/src/tests/ecma_2/String/jstests.list
js/src/tests/ecma_2/String/replace-001.js
js/src/tests/ecma_2/extensions/jstests.list
js/src/tests/ecma_2/instanceof/jstests.list
js/src/tests/ecma_2/jstests.list
js/src/tests/ecma_3/Array/jstests.list
js/src/tests/ecma_3/Array/regress-322135-03.js
js/src/tests/ecma_3/Array/regress-322135-04.js
js/src/tests/ecma_3/Date/15.9.5.5.js
js/src/tests/ecma_3/Date/jstests.list
js/src/tests/ecma_3/Exceptions/jstests.list
js/src/tests/ecma_3/ExecutionContexts/jstests.list
js/src/tests/ecma_3/Expressions/jstests.list
js/src/tests/ecma_3/FunExpr/jstests.list
js/src/tests/ecma_3/Function/jstests.list
js/src/tests/ecma_3/LexicalConventions/jstests.list
js/src/tests/ecma_3/Number/15.7.4.6-1.js
js/src/tests/ecma_3/Number/15.7.4.7-1.js
js/src/tests/ecma_3/Number/jstests.list
js/src/tests/ecma_3/NumberFormatting/jstests.list
js/src/tests/ecma_3/Object/jstests.list
js/src/tests/ecma_3/Operators/jstests.list
js/src/tests/ecma_3/RegExp/jstests.list
js/src/tests/ecma_3/RegExp/regress-289669.js
js/src/tests/ecma_3/RegExp/regress-307456.js
js/src/tests/ecma_3/RegExp/regress-311414.js
js/src/tests/ecma_3/RegExp/regress-330684.js
js/src/tests/ecma_3/RegExp/regress-85721.js
js/src/tests/ecma_3/Regress/jstests.list
js/src/tests/ecma_3/Statements/jstests.list
js/src/tests/ecma_3/Statements/regress-121744.js
js/src/tests/ecma_3/String/15.5.4.11.js
js/src/tests/ecma_3/String/jstests.list
js/src/tests/ecma_3/String/regress-392378.js
js/src/tests/ecma_3/Unicode/jstests.list
js/src/tests/ecma_3/Unicode/uc-001.js
js/src/tests/ecma_3/extensions/jstests.list
js/src/tests/ecma_3/extensions/regress-429248.js
js/src/tests/ecma_3/jstests.list
js/src/tests/ecma_3_1/Object/jstests.list
js/src/tests/ecma_3_1/RegExp/jstests.list
js/src/tests/ecma_3_1/RegExp/regress-305064.js
js/src/tests/ecma_3_1/extensions/jstests.list
js/src/tests/ecma_3_1/jstests.list
js/src/tests/ecma_5/Array/jstests.list
js/src/tests/ecma_5/Boolean/jstests.list
js/src/tests/ecma_5/Date/jstests.list
js/src/tests/ecma_5/Exceptions/jstests.list
js/src/tests/ecma_5/Expressions/jstests.list
js/src/tests/ecma_5/Function/Function-arguments-gc.js
js/src/tests/ecma_5/Function/jstests.list
js/src/tests/ecma_5/Global/adding-global-var-nonextensible-error.js
js/src/tests/ecma_5/Global/cross-global-implicit-this.js
js/src/tests/ecma_5/Global/jstests.list
js/src/tests/ecma_5/JSON/jstests.list
js/src/tests/ecma_5/Number/jstests.list
js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-1-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-2-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-3-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-4-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-5-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-6-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-7-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-8-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-function-length.js
js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-1-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-2-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-3-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-4-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-5-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-6-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-7-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-8-of-8.js
js/src/tests/ecma_5/Object/15.2.3.6-new-definition.js
js/src/tests/ecma_5/Object/15.2.3.6-redefinition-1-of-4.js
js/src/tests/ecma_5/Object/15.2.3.6-redefinition-2-of-4.js
js/src/tests/ecma_5/Object/15.2.3.6-redefinition-3-of-4.js
js/src/tests/ecma_5/Object/15.2.3.6-redefinition-4-of-4.js
js/src/tests/ecma_5/Object/defineProperty-setup.js
js/src/tests/ecma_5/Object/freeze-global-eval-const.js
js/src/tests/ecma_5/Object/jstests.list
js/src/tests/ecma_5/RegExp/jstests.list
js/src/tests/ecma_5/RegExp/regress-617935.js
js/src/tests/ecma_5/String/jstests.list
js/src/tests/ecma_5/Types/jstests.list
js/src/tests/ecma_5/eval/jstests.list
js/src/tests/ecma_5/extensions/cross-global-eval-is-indirect.js
js/src/tests/ecma_5/extensions/function-definition-with.js
js/src/tests/ecma_5/extensions/jstests.list
js/src/tests/ecma_5/extensions/legacy-JSON.js
js/src/tests/ecma_5/extensions/nested-delete-name-in-evalcode.js
js/src/tests/ecma_5/extensions/strict-e4x-ban.js
js/src/tests/ecma_5/jstests.list
js/src/tests/ecma_5/misc/function-definition-evaluate.js
js/src/tests/ecma_5/misc/jstests.list
js/src/tests/ecma_5/strict/jstests.list
js/src/tests/ecma_6/Map/jstests.list
js/src/tests/ecma_6/Set/jstests.list
js/src/tests/ecma_6/jstests.list
js/src/tests/js-test-driver-begin.js
js/src/tests/js1_1/jstests.list
js/src/tests/js1_1/regress/jstests.list
js/src/tests/js1_2/Array/array_split_1.js
js/src/tests/js1_2/Array/jstests.list
js/src/tests/js1_2/Array/tostring_1.js
js/src/tests/js1_2/Array/tostring_2.js
js/src/tests/js1_2/Objects/jstests.list
js/src/tests/js1_2/Objects/toString-001.js
js/src/tests/js1_2/String/concat.js
js/src/tests/js1_2/String/jstests.list
js/src/tests/js1_2/function/Function_object.js
js/src/tests/js1_2/function/Number.js
js/src/tests/js1_2/function/String.js
js/src/tests/js1_2/function/function-001-n.js
js/src/tests/js1_2/function/jstests.list
js/src/tests/js1_2/function/length.js
js/src/tests/js1_2/function/regexparg-2-n.js
js/src/tests/js1_2/function/tostring-1.js
js/src/tests/js1_2/function/tostring-2.js
js/src/tests/js1_2/jstests.list
js/src/tests/js1_2/operator/equality.js
js/src/tests/js1_2/operator/jstests.list
js/src/tests/js1_2/regexp/RegExp_lastIndex.js
js/src/tests/js1_2/regexp/jstests.list
js/src/tests/js1_2/regexp/string_split.js
js/src/tests/js1_2/regress/jstests.list
js/src/tests/js1_2/statements/jstests.list
js/src/tests/js1_2/version120/boolean-001.js
js/src/tests/js1_2/version120/jstests.list
js/src/tests/js1_2/version120/regress-99663.js
js/src/tests/js1_3/Boolean/jstests.list
js/src/tests/js1_3/Script/function-001-n.js
js/src/tests/js1_3/Script/jstests.list
js/src/tests/js1_3/extensions/jstests.list
js/src/tests/js1_3/inherit/jstests.list
js/src/tests/js1_3/jstests.list
js/src/tests/js1_3/misc/jstests.list
js/src/tests/js1_3/regress/function-001-n.js
js/src/tests/js1_3/regress/jstests.list
js/src/tests/js1_4/Eval/jstests.list
js/src/tests/js1_4/Functions/jstests.list
js/src/tests/js1_4/Regress/jstests.list
js/src/tests/js1_4/jstests.list
js/src/tests/js1_5/Array/jstests.list
js/src/tests/js1_5/Array/regress-101964.js
js/src/tests/js1_5/Array/regress-108440.js
js/src/tests/js1_5/Array/regress-157652.js
js/src/tests/js1_5/Array/regress-330812.js
js/src/tests/js1_5/Array/regress-465980-02.js
js/src/tests/js1_5/Array/regress-99120-01.js
js/src/tests/js1_5/Array/regress-99120-02.js
js/src/tests/js1_5/Date/jstests.list
js/src/tests/js1_5/Error/jstests.list
js/src/tests/js1_5/Exceptions/jstests.list
js/src/tests/js1_5/Exceptions/regress-350650-n.js
js/src/tests/js1_5/Expressions/jstests.list
js/src/tests/js1_5/Function/jstests.list
js/src/tests/js1_5/Function/regress-338001.js
js/src/tests/js1_5/Function/regress-338121-01.js
js/src/tests/js1_5/Function/regress-338121-02.js
js/src/tests/js1_5/Function/regress-338121-03.js
js/src/tests/js1_5/GC/jstests.list
js/src/tests/js1_5/GC/regress-319980-01.js
js/src/tests/js1_5/GC/regress-324278.js
js/src/tests/js1_5/GC/regress-338653.js
js/src/tests/js1_5/GC/regress-346794.js
js/src/tests/js1_5/GC/regress-348532.js
js/src/tests/js1_5/GC/regress-383269-01.js
js/src/tests/js1_5/GC/regress-383269-02.js
js/src/tests/js1_5/GC/regress-440558.js
js/src/tests/js1_5/GetSet/jstests.list
js/src/tests/js1_5/GetSet/regress-353264.js
js/src/tests/js1_5/LexicalConventions/jstests.list
js/src/tests/js1_5/Object/jstests.list
js/src/tests/js1_5/Regress/jstests.list
js/src/tests/js1_5/Regress/regress-106244.js
js/src/tests/js1_5/Regress/regress-119719.js
js/src/tests/js1_5/Regress/regress-127243.js
js/src/tests/js1_5/Regress/regress-169559.js
js/src/tests/js1_5/Regress/regress-173067.js
js/src/tests/js1_5/Regress/regress-249211.js
js/src/tests/js1_5/Regress/regress-259935.js
js/src/tests/js1_5/Regress/regress-261887.js
js/src/tests/js1_5/Regress/regress-271716-n.js
js/src/tests/js1_5/Regress/regress-280769-2.js
js/src/tests/js1_5/Regress/regress-303213.js
js/src/tests/js1_5/Regress/regress-312588.js
js/src/tests/js1_5/Regress/regress-313967-01.js
js/src/tests/js1_5/Regress/regress-313967-02.js
js/src/tests/js1_5/Regress/regress-314401.js
js/src/tests/js1_5/Regress/regress-320119.js
js/src/tests/js1_5/Regress/regress-328897.js
js/src/tests/js1_5/Regress/regress-329530.js
js/src/tests/js1_5/Regress/regress-330352.js
js/src/tests/js1_5/Regress/regress-341360.js
js/src/tests/js1_5/Regress/regress-347306-01.js
js/src/tests/js1_5/Regress/regress-350692.js
js/src/tests/js1_5/Regress/regress-351116.js
js/src/tests/js1_5/Regress/regress-354924.js
js/src/tests/js1_5/Regress/regress-362583.js
js/src/tests/js1_5/Regress/regress-3649-n.js
js/src/tests/js1_5/Regress/regress-404755.js
js/src/tests/js1_5/Regress/regress-416628.js
js/src/tests/js1_5/Regress/regress-418540.js
js/src/tests/js1_5/Regress/regress-422348.js
js/src/tests/js1_5/Regress/regress-425360.js
js/src/tests/js1_5/Regress/regress-451322.js
js/src/tests/js1_5/Regress/regress-80981.js
js/src/tests/js1_5/Scope/jstests.list
js/src/tests/js1_5/String/jstests.list
js/src/tests/js1_5/String/regress-157334-01.js
js/src/tests/js1_5/String/regress-314890.js
js/src/tests/js1_5/String/regress-322772.js
js/src/tests/js1_5/String/regress-56940-01.js
js/src/tests/js1_5/String/regress-56940-02.js
js/src/tests/js1_5/decompilation/jstests.list
js/src/tests/js1_5/decompilation/regress-349484.js
js/src/tests/js1_5/decompilation/regress-351336.js
js/src/tests/js1_5/decompilation/regress-351626.js
js/src/tests/js1_5/decompilation/regress-354878.js
js/src/tests/js1_5/decompilation/regress-373678.js
js/src/tests/js1_5/decompilation/regress-437288-02.js
js/src/tests/js1_5/extensions/jstests.list
js/src/tests/js1_5/extensions/regress-330569.js
js/src/tests/js1_5/extensions/regress-335700.js
js/src/tests/js1_5/extensions/regress-336409-1.js
js/src/tests/js1_5/extensions/regress-336409-2.js
js/src/tests/js1_5/extensions/regress-336410-1.js
js/src/tests/js1_5/extensions/regress-336410-2.js
js/src/tests/js1_5/extensions/regress-342960.js
js/src/tests/js1_5/extensions/regress-345967.js
js/src/tests/js1_5/extensions/regress-347306-02.js
js/src/tests/js1_5/extensions/regress-350531.js
js/src/tests/js1_5/extensions/regress-351448.js
js/src/tests/js1_5/extensions/regress-352281.js
js/src/tests/js1_5/extensions/regress-355622.js
js/src/tests/js1_5/extensions/regress-361964.js
js/src/tests/js1_5/extensions/regress-363258.js
js/src/tests/js1_5/extensions/regress-365527.js
js/src/tests/js1_5/extensions/regress-367589.js
js/src/tests/js1_5/extensions/regress-406572.js
js/src/tests/js1_5/extensions/regress-407501.js
js/src/tests/js1_5/extensions/regress-407720.js
js/src/tests/js1_5/extensions/regress-414755.js
js/src/tests/js1_5/extensions/regress-416354.js
js/src/tests/js1_5/extensions/regress-418730.js
js/src/tests/js1_5/extensions/regress-421621.js
js/src/tests/js1_5/extensions/regress-422137.js
js/src/tests/js1_5/extensions/regress-429264.js
js/src/tests/js1_5/extensions/regress-431428.js
js/src/tests/js1_5/extensions/regress-432075.js
js/src/tests/js1_5/extensions/regress-435345-01.js
js/src/tests/js1_5/extensions/regress-437288-01.js
js/src/tests/js1_5/extensions/regress-452168.js
js/src/tests/js1_5/extensions/regress-454142.js
js/src/tests/js1_5/extensions/regress-472787.js
js/src/tests/js1_5/extensions/regress-50447.js
js/src/tests/js1_5/extensions/toLocaleFormat-02.js
js/src/tests/js1_5/jstests.list
js/src/tests/js1_6/Array/jstests.list
js/src/tests/js1_6/Array/regress-320887.js
js/src/tests/js1_6/Regress/jstests.list
js/src/tests/js1_6/String/jstests.list
js/src/tests/js1_6/decompilation/jstests.list
js/src/tests/js1_6/extensions/jstests.list
js/src/tests/js1_6/extensions/regress-455464-01.js
js/src/tests/js1_6/extensions/regress-455464-02.js
js/src/tests/js1_6/extensions/regress-455464-03.js
js/src/tests/js1_6/extensions/regress-455464-04.js
js/src/tests/js1_6/extensions/regress-456826.js
js/src/tests/js1_6/extensions/regress-475144.js
js/src/tests/js1_6/jstests.list
js/src/tests/js1_7/GC/jstests.list
js/src/tests/js1_7/GC/regress-381374.js
js/src/tests/js1_7/block/jstests.list
js/src/tests/js1_7/block/regress-352609.js
js/src/tests/js1_7/decompilation/jstests.list
js/src/tests/js1_7/decompilation/regress-346642-01.js
js/src/tests/js1_7/decompilation/regress-349602.js
js/src/tests/js1_7/decompilation/regress-349605.js
js/src/tests/js1_7/decompilation/regress-349634.js
js/src/tests/js1_7/decompilation/regress-350991.js
js/src/tests/js1_7/decompilation/regress-351070-01.js
js/src/tests/js1_7/decompilation/regress-352011.js
js/src/tests/js1_7/decompilation/regress-352022.js
js/src/tests/js1_7/decompilation/regress-352026.js
js/src/tests/js1_7/decompilation/regress-371802.js
js/src/tests/js1_7/decompilation/regress-429252.js
js/src/tests/js1_7/expressions/jstests.list
js/src/tests/js1_7/extensions/jstests.list
js/src/tests/js1_7/extensions/regress-353214-01.js
js/src/tests/js1_7/extensions/regress-353214-02.js
js/src/tests/js1_7/extensions/regress-353249.js
js/src/tests/js1_7/extensions/regress-455982-01.js
js/src/tests/js1_7/extensions/regress-455982-02.js
js/src/tests/js1_7/extensions/regress-458679.js
js/src/tests/js1_7/extensions/regress-476257.js
js/src/tests/js1_7/geniter/jstests.list
js/src/tests/js1_7/geniter/regress-347739.js
js/src/tests/js1_7/geniter/regress-349012-01.js
js/src/tests/js1_7/geniter/regress-349331.js
js/src/tests/js1_7/iterable/jstests.list
js/src/tests/js1_7/iterable/regress-340526-02.js
js/src/tests/js1_7/iterable/regress-341815.js
js/src/tests/js1_7/iterable/regress-341821.js
js/src/tests/js1_7/jstests.list
js/src/tests/js1_7/lexical/jstests.list
js/src/tests/js1_7/lexical/regress-346642-03.js
js/src/tests/js1_7/regexp/jstests.list
js/src/tests/js1_7/regress/jstests.list
js/src/tests/js1_7/regress/regress-350387.js
js/src/tests/js1_7/regress/regress-420399.js
js/src/tests/js1_7/regress/regress-474771.js
js/src/tests/js1_8/decompilation/jstests.list
js/src/tests/js1_8/decompilation/regress-443074.js
js/src/tests/js1_8/extensions/dekker.js
js/src/tests/js1_8/extensions/for-in.js
js/src/tests/js1_8/extensions/jstests.list
js/src/tests/js1_8/extensions/lamport.js
js/src/tests/js1_8/extensions/peterson.js
js/src/tests/js1_8/extensions/regress-415721.js
js/src/tests/js1_8/extensions/regress-417131.js
js/src/tests/js1_8/extensions/regress-417817.js
js/src/tests/js1_8/extensions/regress-419091.js
js/src/tests/js1_8/extensions/regress-445818.js
js/src/tests/js1_8/extensions/regress-446169-01.js
js/src/tests/js1_8/extensions/regress-446169-02.js
js/src/tests/js1_8/extensions/regress-452476.js
js/src/tests/js1_8/extensions/regress-471197.js
js/src/tests/js1_8/extensions/regress-475971.js
js/src/tests/js1_8/extensions/regress-476414-01.js
js/src/tests/js1_8/extensions/regress-476414-02.js
js/src/tests/js1_8/extensions/regress-476427.js
js/src/tests/js1_8/extensions/regress-476869.js
js/src/tests/js1_8/extensions/regress-479252.js
js/src/tests/js1_8/extensions/regress-479381.js
js/src/tests/js1_8/extensions/simple-tree.js
js/src/tests/js1_8/genexps/jstests.list
js/src/tests/js1_8/genexps/regress-380237-04.js
js/src/tests/js1_8/jstests.list
js/src/tests/js1_8/regress/jstests.list
js/src/tests/js1_8/regress/regress-442333-01.js
js/src/tests/js1_8/regress/regress-464418.js
js/src/tests/js1_8/regress/regress-474771.js
js/src/tests/js1_8_1/JSON/jstests.list
js/src/tests/js1_8_1/String/jstests.list
js/src/tests/js1_8_1/String/regress-305064.js
js/src/tests/js1_8_1/decompilation/jstests.list
js/src/tests/js1_8_1/extensions/jstests.list
js/src/tests/js1_8_1/extensions/regress-466905-05.js
js/src/tests/js1_8_1/extensions/regress-477187.js
js/src/tests/js1_8_1/jit/jstests.list
js/src/tests/js1_8_1/jit/regress-451673.js
js/src/tests/js1_8_1/jit/regress-451974-01.js
js/src/tests/js1_8_1/jit/regress-451974-02.js
js/src/tests/js1_8_1/jit/regress-452498-01.js
js/src/tests/js1_8_1/jit/regress-469927.js
js/src/tests/js1_8_1/jit/regress-470739.js
js/src/tests/js1_8_1/jstests.list
js/src/tests/js1_8_1/regress/jstests.list
js/src/tests/js1_8_1/regress/regress-452498-052-a.js
js/src/tests/js1_8_1/regress/regress-452498-099-a.js
js/src/tests/js1_8_1/regress/regress-452498-135-a.js
js/src/tests/js1_8_1/regress/regress-452498-168-2.js
js/src/tests/js1_8_1/regress/regress-479430-01.js
js/src/tests/js1_8_1/regress/regress-479430-02.js
js/src/tests/js1_8_1/regress/regress-479430-03.js
js/src/tests/js1_8_1/regress/regress-479430-04.js
js/src/tests/js1_8_1/regress/regress-479430-05.js
js/src/tests/js1_8_1/regress/regress-524743.js
js/src/tests/js1_8_1/strict/12.2.1.js
js/src/tests/js1_8_1/strict/8.7.2.js
js/src/tests/js1_8_1/strict/generator-eval-arguments.js
js/src/tests/js1_8_1/strict/jstests.list
js/src/tests/js1_8_1/strict/let-block-eval-arguments.js
js/src/tests/js1_8_5/extensions/clone-complex-object.js
js/src/tests/js1_8_5/extensions/clone-errors.js
js/src/tests/js1_8_5/extensions/clone-forge.js
js/src/tests/js1_8_5/extensions/clone-leaf-object.js
js/src/tests/js1_8_5/extensions/clone-object.js
js/src/tests/js1_8_5/extensions/clone-regexp.js
js/src/tests/js1_8_5/extensions/clone-simple.js
js/src/tests/js1_8_5/extensions/clone-typed-array.js
js/src/tests/js1_8_5/extensions/jstests.list
js/src/tests/js1_8_5/extensions/proxy-fix.js
js/src/tests/js1_8_5/extensions/proxy-proto-setter.js
js/src/tests/js1_8_5/extensions/reflect-parse.js
js/src/tests/js1_8_5/extensions/regress-636818.js
js/src/tests/js1_8_5/extensions/regress-672804-1.js
js/src/tests/js1_8_5/extensions/regress-672804-2.js
js/src/tests/js1_8_5/extensions/regress-672804-3.js
js/src/tests/js1_8_5/extensions/regress-677589.js
js/src/tests/js1_8_5/extensions/regress-696109.js
js/src/tests/js1_8_5/extensions/worker-error-child.js
js/src/tests/js1_8_5/extensions/worker-error-propagation-child.js
js/src/tests/js1_8_5/extensions/worker-error-propagation.js
js/src/tests/js1_8_5/extensions/worker-error.js
js/src/tests/js1_8_5/extensions/worker-fib-child.js
js/src/tests/js1_8_5/extensions/worker-fib.js
js/src/tests/js1_8_5/extensions/worker-init-child.js
js/src/tests/js1_8_5/extensions/worker-init.js
js/src/tests/js1_8_5/extensions/worker-simple-child.js
js/src/tests/js1_8_5/extensions/worker-simple.js
js/src/tests/js1_8_5/extensions/worker-terminate-child.js
js/src/tests/js1_8_5/extensions/worker-terminate-iloop.js
js/src/tests/js1_8_5/extensions/worker-terminate.js
js/src/tests/js1_8_5/extensions/worker-timeout-child.js
js/src/tests/js1_8_5/extensions/worker-timeout.js
js/src/tests/js1_8_5/jstests.list
js/src/tests/js1_8_5/regress/jstests.list
js/src/tests/js1_8_5/regress/regress-476088.js
js/src/tests/js1_8_5/regress/regress-548276.js
js/src/tests/js1_8_5/regress/regress-563210.js
js/src/tests/js1_8_5/regress/regress-584578.js
js/src/tests/js1_8_5/regress/regress-584648.js
js/src/tests/js1_8_5/regress/regress-585257.js
js/src/tests/js1_8_5/regress/regress-591897.js
js/src/tests/js1_8_5/regress/regress-595230-1.js
js/src/tests/js1_8_5/regress/regress-595230-2.js
js/src/tests/js1_8_5/regress/regress-595365-2.js
js/src/tests/js1_8_5/regress/regress-607799.js
js/src/tests/js1_8_5/regress/regress-607863.js
js/src/tests/js1_8_5/regress/regress-618574.js
js/src/tests/js1_8_5/regress/regress-618576.js
js/src/tests/js1_8_5/regress/regress-620376-1.js
js/src/tests/js1_8_5/regress/regress-698028-2.js
js/src/tests/jstests.list
js/src/tests/jstests.py
js/src/tests/manifest.py
js/src/tests/tests.py
--- a/js/src/tests/Makefile.in
+++ b/js/src/tests/Makefile.in
@@ -73,8 +73,10 @@ TEST_FILES = \
   $(NULL)
 
 PKG_STAGE = $(DIST)/test-package-stage
 
 # stage tests for packaging
 stage-package:
 	$(NSINSTALL) -D $(PKG_STAGE)/jsreftest/tests
 	@(cd $(srcdir) && tar $(TAR_CREATE_FLAGS) - $(TEST_FILES)) | (cd $(PKG_STAGE)/jsreftest/tests && tar -xf -)
+	$(srcdir)/jstests.py --make-manifests $(PKG_STAGE)/jsreftest/tests/
+
new file mode 100644
--- /dev/null
+++ b/js/src/tests/README.txt
@@ -0,0 +1,31 @@
+JS Test Suite Readme
+====================
+
+The JS test suite is a fairly extensive collection of correctness and regression
+tests for the Spidermonkey engine. Two harnesses run these tests: the shell test
+harness in this directory and the "reftest" harness built into the browser, used
+by Tinderbox. The browser reftests require additional manifest files; these are
+generated automatically by the build phase 'package-tests'.
+
+Adding a test
+-------------
+    Drop it in an appropriate directory under the tests directory.
+
+        <fineprint> Some names are forbidden. Do not name your test browser.js,
+        shell.js, jsref.js, template.js, user.js, js-test-driver-begin.js, or
+        js-test-driver-end.js. </fineprint>
+
+Adjusting when and how a test runs
+----------------------------------
+    Put a comment at the top of the header matching the format:
+        // |reftest| <options> -- <comment>
+
+    Where <options> is a standard reftest options string, as documented by:
+        http://mxr.mozilla.org/mozilla-central/source/layout/tools/reftest/README.txt
+
+    Example:
+        // |reftest| skip-if(!xulRuntime.shell) -- does not always dismiss alert
+
+        <fineprint> Either // or /* */ style comments may be used. The entire
+        comment must appear in the first 512 bytes of the file. The control
+        string must be in its own comment block. </fineprint>
--- a/js/src/tests/e4x/Expressions/11.1.4-08.js
+++ b/js/src/tests/e4x/Expressions/11.1.4-08.js
@@ -1,8 +1,9 @@
+// |reftest| fails
 /* -*- Mode: java; tab-width:8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
deleted file mode 100644
--- a/js/src/tests/e4x/Expressions/jstests.list
+++ /dev/null
@@ -1,30 +0,0 @@
-url-prefix ../../jsreftest.html?test=e4x/Expressions/
-script 11.1.1.js
-script 11.1.2.js
-script 11.1.3.js
-script 11.1.4-01.js
-script 11.1.4-02.js
-script 11.1.4-03.js
-script 11.1.4-04.js
-script 11.1.4-05.js
-script 11.1.4-06.js
-script 11.1.4-07.js
-fails script 11.1.4-08.js
-script 11.1.4.js
-script 11.1.5.js
-script 11.2.1.js
-script 11.2.2.js
-script 11.2.3.js
-script 11.2.4.js
-script 11.3.1.js
-script 11.3.2.js
-script 11.4.1.js
-script 11.5.1.js
-script 11.6.1.js
-script 11.6.2.js
-script 11.6.3.js
-script regress-301545.js
-script regress-302531.js
-script regress-340024.js
-script regress-366123.js
-script regress-496113.js
deleted file mode 100644
--- a/js/src/tests/e4x/GC/jstests.list
+++ /dev/null
@@ -1,11 +0,0 @@
-url-prefix ../../jsreftest.html?test=e4x/GC/
-skip-if(Android) script regress-280844-1.js
-skip-if(Android) script regress-280844-2.js
-skip-if(!xulRuntime.shell) script regress-292455.js # does not always dismiss alert
-script regress-313952-01.js
-script regress-313952-02.js
-script regress-324117.js
-skip script regress-324278.js # slow
-script regress-339785.js
-script regress-357063-01.js
-script regress-357063-02.js
--- a/js/src/tests/e4x/GC/regress-280844-1.js
+++ b/js/src/tests/e4x/GC/regress-280844-1.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android)
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/e4x/GC/regress-280844-2.js
+++ b/js/src/tests/e4x/GC/regress-280844-2.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android)
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/e4x/GC/regress-292455.js
+++ b/js/src/tests/e4x/GC/regress-292455.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) -- does not always dismiss alert
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/e4x/GC/regress-324278.js
+++ b/js/src/tests/e4x/GC/regress-324278.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/e4x/Global/13.1.2.1.js
+++ b/js/src/tests/e4x/Global/13.1.2.1.js
@@ -1,8 +1,9 @@
+// |reftest| fails
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
deleted file mode 100644
--- a/js/src/tests/e4x/Global/jstests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-url-prefix ../../jsreftest.html?test=e4x/Global/
-fails script 13.1.2.1.js
deleted file mode 100644
--- a/js/src/tests/e4x/Namespace/jstests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-url-prefix ../../jsreftest.html?test=e4x/Namespace/
-script 13.2.1.js
-script 13.2.2.js
-script 13.2.5.js
-script regress-283972.js
-fails script regress-292863.js
-script regress-350442.js
-script regress-444608-02.js
-script regress-444608.js
--- a/js/src/tests/e4x/Namespace/regress-292863.js
+++ b/js/src/tests/e4x/Namespace/regress-292863.js
@@ -1,8 +1,9 @@
+// |reftest| fails
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/e4x/QName/jstests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-url-prefix ../../jsreftest.html?test=e4x/QName/
-script 13.3.1.js
-script 13.3.2.js
-script 13.3.5.js
-script regress-373595-01.js
-script regress-373595-02.js
-script regress-373595-03.js
-script regress-444608.js
-script regress-619529.js
deleted file mode 100644
--- a/js/src/tests/e4x/Regress/jstests.list
+++ /dev/null
@@ -1,96 +0,0 @@
-url-prefix ../../jsreftest.html?test=e4x/Regress/
-script regress-257679.js
-script regress-263934.js
-script regress-263935.js
-script regress-263936.js
-script regress-264369.js
-script regress-271545.js
-script regress-277650.js
-script regress-277664.js
-script regress-277683.js
-script regress-277779.js
-script regress-277935.js
-skip script regress-278112.js # obsolete test
-script regress-283349.js
-script regress-290056.js
-script regress-290499.js
-script regress-301553.js
-script regress-301573.js
-script regress-301596.js
-script regress-301692.js
-skip-if(!xulRuntime.shell&&isDebugBuild) slow script regress-308111.js
-script regress-309897.js
-script regress-311580.js
-script regress-313799.js
-script regress-318922.js
-skip script regress-319872.js # slow
-script regress-321547.js
-script regress-322499.js
-script regress-323338-1.js
-script regress-323338-2.js
-script regress-325425.js
-script regress-327564.js
-script regress-327691-01.js
-script regress-327691-02.js
-script regress-327697.js
-script regress-328249.js
-script regress-329257.js
-script regress-331558.js
-script regress-331664.js
-script regress-344455.js
-script regress-347155.js
-script regress-350206-1.js
-script regress-350206.js
-skip-if(!xulRuntime.shell) slow script regress-350238.js
-script regress-350629.js
-script regress-352097.js
-script regress-352103.js
-script regress-352223.js
-script regress-354145-01.js
-script regress-354145-02.js
-script regress-354145-03.js
-script regress-354145-04.js
-script regress-354145-05.js
-script regress-354145-07.js
-script regress-354998.js
-script regress-355474-02.js
-script regress-355478.js
-script regress-355569.js
-script regress-356238-01.js
-script regress-356238-02.js
-script regress-356238-03.js
-skip script regress-361451.js # obsolete test
-script regress-364017.js
-script regress-369032.js
-script regress-369536.js
-script regress-369740.js
-script regress-370016.js
-script regress-370048-01.js
-script regress-370048-02.js
-script regress-370372.js
-script regress-371369.js
-script regress-372563.js
-script regress-372564.js
-script regress-373082.js
-script regress-374106.js
-script regress-374112.js
-script regress-374116.js
-script regress-374160.js
-script regress-375406.js
-script regress-378492.js
-script regress-380833.js
-script regress-383255.js
-skip-if(Android) silentfail script regress-394941.js
-script regress-407323.js
-script regress-426520.js
-script regress-453915.js
-skip-if(Android) silentfail script regress-458679-01.js
-skip-if(Android) silentfail script regress-458679-02.js
-script regress-460180.js
-script regress-465063.js
-script regress-470619.js
-skip-if(Android) script regress-473709.js
-skip-if(Android) script regress-474319.js
-script regress-477053.js
-script regress-561031.js
-script regress-587434.js
--- a/js/src/tests/e4x/Regress/regress-278112.js
+++ b/js/src/tests/e4x/Regress/regress-278112.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Regress/regress-308111.js
+++ b/js/src/tests/e4x/Regress/regress-308111.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell&&isDebugBuild) slow
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/e4x/Regress/regress-319872.js
+++ b/js/src/tests/e4x/Regress/regress-319872.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/e4x/Regress/regress-350238.js
+++ b/js/src/tests/e4x/Regress/regress-350238.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) slow
 /* -*- Mode: java; tab-width:8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Regress/regress-361451.js
+++ b/js/src/tests/e4x/Regress/regress-361451.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width:8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Regress/regress-394941.js
+++ b/js/src/tests/e4x/Regress/regress-394941.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) silentfail
 /* -*- Mode: java; tab-width:8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Regress/regress-458679-01.js
+++ b/js/src/tests/e4x/Regress/regress-458679-01.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) silentfail
 /* -*- Mode: java; tab-width:8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Regress/regress-458679-02.js
+++ b/js/src/tests/e4x/Regress/regress-458679-02.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) silentfail
 /* -*- Mode: java; tab-width:8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Regress/regress-473709.js
+++ b/js/src/tests/e4x/Regress/regress-473709.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android)
 /* -*- Mode: java; tab-width:8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Regress/regress-474319.js
+++ b/js/src/tests/e4x/Regress/regress-474319.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android)
 /* -*- Mode: java; tab-width:8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
deleted file mode 100644
--- a/js/src/tests/e4x/Statements/jstests.list
+++ /dev/null
@@ -1,4 +0,0 @@
-url-prefix ../../jsreftest.html?test=e4x/Statements/
-script 12.1.js
-script 12.2.js
-script 12.3-01.js
--- a/js/src/tests/e4x/TypeConversion/10.2.1.js
+++ b/js/src/tests/e4x/TypeConversion/10.2.1.js
@@ -1,8 +1,9 @@
+// |reftest| fails
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 /*
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
--- a/js/src/tests/e4x/TypeConversion/10.5.1.js
+++ b/js/src/tests/e4x/TypeConversion/10.5.1.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/TypeConversion/10.5.js
+++ b/js/src/tests/e4x/TypeConversion/10.5.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/TypeConversion/10.6.1.js
+++ b/js/src/tests/e4x/TypeConversion/10.6.1.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/TypeConversion/10.6.js
+++ b/js/src/tests/e4x/TypeConversion/10.6.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
deleted file mode 100644
--- a/js/src/tests/e4x/TypeConversion/jstests.list
+++ /dev/null
@@ -1,13 +0,0 @@
-url-prefix ../../jsreftest.html?test=e4x/TypeConversion/
-script 10.1.1.js
-script 10.1.2.js
-fails script 10.2.1.js
-script 10.3.1.js
-script 10.3.js
-script 10.4.1.js
-script 10.4.js
-skip script 10.5.1.js # obsolete test
-skip script 10.5.js # obsolete test
-skip script 10.6.1.js # obsolete test
-skip script 10.6.js # obsolete test
-script regress-302097.js
--- a/js/src/tests/e4x/Types/9.1.1.10.js
+++ b/js/src/tests/e4x/Types/9.1.1.10.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Types/9.1.1.11.js
+++ b/js/src/tests/e4x/Types/9.1.1.11.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Types/9.1.1.12.js
+++ b/js/src/tests/e4x/Types/9.1.1.12.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Types/9.1.1.13.js
+++ b/js/src/tests/e4x/Types/9.1.1.13.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Types/9.1.1.4.js
+++ b/js/src/tests/e4x/Types/9.1.1.4.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Types/9.1.1.5.js
+++ b/js/src/tests/e4x/Types/9.1.1.5.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Types/9.1.1.7.js
+++ b/js/src/tests/e4x/Types/9.1.1.7.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Types/9.1.1.8.js
+++ b/js/src/tests/e4x/Types/9.1.1.8.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Types/9.2.1.10.js
+++ b/js/src/tests/e4x/Types/9.2.1.10.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Types/9.2.1.3.js
+++ b/js/src/tests/e4x/Types/9.2.1.3.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Types/9.2.1.4.js
+++ b/js/src/tests/e4x/Types/9.2.1.4.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Types/9.2.1.5.js
+++ b/js/src/tests/e4x/Types/9.2.1.5.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Types/9.2.1.6.js
+++ b/js/src/tests/e4x/Types/9.2.1.6.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/Types/9.2.1.7.js
+++ b/js/src/tests/e4x/Types/9.2.1.7.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
deleted file mode 100644
--- a/js/src/tests/e4x/Types/jstests.list
+++ /dev/null
@@ -1,24 +0,0 @@
-url-prefix ../../jsreftest.html?test=e4x/Types/
-script 9.1.1.1.js
-skip script 9.1.1.10.js # obsolete test
-skip script 9.1.1.11.js # obsolete test
-skip script 9.1.1.12.js # obsolete test
-skip script 9.1.1.13.js # obsolete test
-script 9.1.1.2.js
-script 9.1.1.3.js
-skip script 9.1.1.4.js # obsolete test
-skip script 9.1.1.5.js # obsolete test
-script 9.1.1.6.js
-skip script 9.1.1.7.js # obsolete test
-skip script 9.1.1.8.js # obsolete test
-script 9.1.1.9.js
-script 9.2.1.1.js
-skip script 9.2.1.10.js # obsolete test
-script 9.2.1.2.js
-skip script 9.2.1.3.js # obsolete test
-skip script 9.2.1.4.js # obsolete test
-skip script 9.2.1.5.js # obsolete test
-skip script 9.2.1.6.js # obsolete test
-skip script 9.2.1.7.js # obsolete test
-script 9.2.1.8.js
-script 9.2.1.9.js
--- a/js/src/tests/e4x/XML/13.4.4.1.js
+++ b/js/src/tests/e4x/XML/13.4.4.1.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
deleted file mode 100644
--- a/js/src/tests/e4x/XML/jstests.list
+++ /dev/null
@@ -1,57 +0,0 @@
-url-prefix ../../jsreftest.html?test=e4x/XML/
-script 13.4.1.js
-script 13.4.2.js
-script 13.4.3.10.js
-script 13.4.3.js
-skip script 13.4.4.1.js # obsolete test
-script 13.4.4.10.js
-script 13.4.4.11.js
-script 13.4.4.12-1.js
-script 13.4.4.12.js
-script 13.4.4.13.js
-script 13.4.4.14.js
-script 13.4.4.15.js
-script 13.4.4.16.js
-script 13.4.4.17.js
-script 13.4.4.18.js
-script 13.4.4.19.js
-script 13.4.4.2.js
-script 13.4.4.20.js
-script 13.4.4.21.js
-script 13.4.4.22.js
-script 13.4.4.23.js
-script 13.4.4.24.js
-script 13.4.4.25.js
-script 13.4.4.26.js
-script 13.4.4.27.js
-script 13.4.4.28.js
-script 13.4.4.29.js
-script 13.4.4.3-01.js
-script 13.4.4.3-02.js
-script 13.4.4.3.js
-script 13.4.4.30.js
-script 13.4.4.31.js
-script 13.4.4.32-01.js
-script 13.4.4.32.js
-script 13.4.4.33.js
-script 13.4.4.34.js
-script 13.4.4.35.js
-script 13.4.4.36.js
-script 13.4.4.37.js
-script 13.4.4.38.js
-script 13.4.4.39.js
-script 13.4.4.4.js
-script 13.4.4.40.js
-script 13.4.4.5.js
-script 13.4.4.6.js
-script 13.4.4.7.js
-script 13.4.4.8.js
-script 13.4.4.9.js
-script regress-291930.js
-skip-if(Android) silentfail script regress-324422-1.js
-skip script regress-324422-2.js # slow
-skip script regress-324688.js # bug 528404 - disable due to random timeouts
-script regress-336921.js
-script regress-376773.js
-script regress-621464.js
-script regress-638982.js
--- a/js/src/tests/e4x/XML/regress-324422-1.js
+++ b/js/src/tests/e4x/XML/regress-324422-1.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) silentfail
 /* -*- Mode: java; tab-width:8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/XML/regress-324422-2.js
+++ b/js/src/tests/e4x/XML/regress-324422-2.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- slow
 /* -*- Mode: java; tab-width:8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/XML/regress-324688.js
+++ b/js/src/tests/e4x/XML/regress-324688.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- bug 528404 - disable due to random timeouts
 /* -*- Mode: java; tab-width:8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
deleted file mode 100644
--- a/js/src/tests/e4x/XMLList/jstests.list
+++ /dev/null
@@ -1,25 +0,0 @@
-url-prefix ../../jsreftest.html?test=e4x/XMLList/
-script 13.5.1.js
-script 13.5.2.js
-script 13.5.4.10.js
-script 13.5.4.11.js
-script 13.5.4.12.js
-script 13.5.4.13.js
-script 13.5.4.14.js
-script 13.5.4.15.js
-script 13.5.4.16.js
-script 13.5.4.17.js
-script 13.5.4.18.js
-script 13.5.4.19.js
-script 13.5.4.2.js
-script 13.5.4.20.js
-script 13.5.4.21.js
-script 13.5.4.22.js
-script 13.5.4.3.js
-script 13.5.4.4.js
-script 13.5.4.5.js
-script 13.5.4.6.js
-script 13.5.4.7.js
-script 13.5.4.8.js
-script 13.5.4.9.js
-script regress-373072.js
--- a/js/src/tests/e4x/decompilation/decompile-xml-escapes.js
+++ b/js/src/tests/e4x/decompilation/decompile-xml-escapes.js
@@ -1,8 +1,9 @@
+// |reftest| fails
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/e4x/decompilation/jstests.list
+++ /dev/null
@@ -1,20 +0,0 @@
-url-prefix ../../jsreftest.html?test=e4x/decompilation/
-fails script decompile-xml-escapes.js
-script regress-349814.js
-script regress-349815.js
-script regress-349822.js
-script regress-349956.js
-script regress-350226.js
-script regress-350531.js
-script regress-351706.js
-script regress-351988.js
-script regress-352013.js
-script regress-352459.js
-script regress-352649.js
-script regress-352789.js
-script regress-355101.js
-script regress-355474-01.js
-skip script regress-373678.js # obsolete test
-require-or(debugMode,skip) script regress-429249.js
-script regress-461233.js
-script regress-463360.js
--- a/js/src/tests/e4x/decompilation/regress-373678.js
+++ b/js/src/tests/e4x/decompilation/regress-373678.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: java; tab-width:8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/decompilation/regress-429249.js
+++ b/js/src/tests/e4x/decompilation/regress-429249.js
@@ -1,8 +1,9 @@
+// |reftest| require-or(debugMode,skip)
 /* -*- Mode: java; tab-width:8; indent-tabs-mode: nil; c-basic-offset: 4 -*- */
 
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
--- a/js/src/tests/e4x/extensions/assign-to-xml.js
+++ b/js/src/tests/e4x/extensions/assign-to-xml.js
@@ -1,8 +1,9 @@
+// |reftest| skip
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 try
 {
   eval("d, {" +
        "  x: [{" +
        "    x: x::x" +
deleted file mode 100644
--- a/js/src/tests/e4x/extensions/jstests.list
+++ /dev/null
@@ -1,26 +0,0 @@
-url-prefix ../../jsreftest.html?test=e4x/extensions/
-script regress-305335.js
-script regress-312196.js
-script regress-313080.js
-script regress-321547.js
-script regress-327534.js
-script regress-327897.js
-script regress-337226.js
-script regress-352846-01.js
-script regress-352846-02.js
-script regress-352846-03.js
-script regress-353165.js
-script regress-354145-06.js
-script regress-354151-01.js
-script regress-354151-02.js
-script regress-374025.js
-script regress-374163.js
-script regress-410192.js
-script regress-450871-01.js
-script regress-450871-02.js
-script regress-462734-01.js
-script extensibility.js
-script regress-595207.js
-script json-stringify-dropping-xml-elements.js
-script stringify-xml.js
-script xml-as-proto.js
--- a/js/src/tests/e4x/extensions/qualified-name-expr.js
+++ b/js/src/tests/e4x/extensions/qualified-name-expr.js
@@ -1,8 +1,9 @@
+// |reftest| skip
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 var v;
 (function::v);
 
 function f() { }
 (function::f);
deleted file mode 100644
--- a/js/src/tests/e4x/jstests.list
+++ /dev/null
@@ -1,13 +0,0 @@
-include decompilation/jstests.list
-include Expressions/jstests.list
-include extensions/jstests.list
-include GC/jstests.list
-include Global/jstests.list
-include Namespace/jstests.list
-include QName/jstests.list
-include Regress/jstests.list
-include Statements/jstests.list
-include TypeConversion/jstests.list
-include Types/jstests.list
-include XML/jstests.list
-include XMLList/jstests.list
deleted file mode 100644
--- a/js/src/tests/ecma/Array/jstests.list
+++ /dev/null
@@ -1,30 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/Array/
-script 15.4-1.js
-script 15.4-2.js
-script 15.4.1.1.js
-script 15.4.1.2.js
-script 15.4.1.3.js
-script 15.4.1.js
-script 15.4.2.1-1.js
-script 15.4.2.1-2.js
-script 15.4.2.1-3.js
-script 15.4.2.2-1.js
-script 15.4.2.2-2.js
-script 15.4.2.3.js
-script 15.4.3.1-2.js
-script 15.4.3.2.js
-script 15.4.4.1.js
-script 15.4.4.2.js
-script 15.4.4.3-1.js
-script 15.4.4.3-2.js
-script 15.4.4.4-1.js
-script 15.4.4.4-2.js
-script 15.4.4.5-1.js
-script 15.4.4.5-2.js
-script 15.4.4.5-3.js
-script 15.4.4.js
-script 15.4.5.1-1.js
-script 15.4.5.1-2.js
-script 15.4.5.2-1.js
-script 15.4.5.2-2.js
-script array-length-set-on-nonarray.js
deleted file mode 100644
--- a/js/src/tests/ecma/Boolean/jstests.list
+++ /dev/null
@@ -1,20 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/Boolean/
-script 15.6.1.js
-script 15.6.2.js
-script 15.6.3.1-1.js
-script 15.6.3.1-2.js
-script 15.6.3.1-3.js
-script 15.6.3.1-4.js
-script 15.6.3.1.js
-script 15.6.4-1.js
-script 15.6.4.1.js
-script 15.6.4.2-1.js
-script 15.6.4.2-2.js
-script 15.6.4.2-3.js
-script 15.6.4.2-4-n.js
-script 15.6.4.3-1.js
-script 15.6.4.3-2.js
-script 15.6.4.3-3.js
-script 15.6.4.3-4-n.js
-script 15.6.4.3.js
-script 15.6.4.js
--- a/js/src/tests/ecma/Date/15.9.5.12-2.js
+++ b/js/src/tests/ecma/Date/15.9.5.12-2.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell&&xulRuntime.OS=="Linux"&&xulRuntime.XPCOMABI.match(/x86_64/)) -- bug xxx crash
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma/Date/15.9.5.14.js
+++ b/js/src/tests/ecma/Date/15.9.5.14.js
@@ -1,8 +1,9 @@
+// |reftest| random
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma/Date/15.9.5.16.js
+++ b/js/src/tests/ecma/Date/15.9.5.16.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell&&xulRuntime.OS=="Linux"&&xulRuntime.XPCOMABI.match(/x86_64/)) -- bug xxx crash
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma/Date/15.9.5.28-1.js
+++ b/js/src/tests/ecma/Date/15.9.5.28-1.js
@@ -1,8 +1,9 @@
+// |reftest| fails-if(Android)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma/Date/15.9.5.29-1.js
+++ b/js/src/tests/ecma/Date/15.9.5.29-1.js
@@ -1,8 +1,9 @@
+// |reftest| fails-if(Android)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma/Date/15.9.5.34-1.js
+++ b/js/src/tests/ecma/Date/15.9.5.34-1.js
@@ -1,8 +1,9 @@
+// |reftest| random
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma/Date/15.9.5.35-1.js
+++ b/js/src/tests/ecma/Date/15.9.5.35-1.js
@@ -1,8 +1,9 @@
+// |reftest| fails-if(Android)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma/Date/15.9.5.8.js
+++ b/js/src/tests/ecma/Date/15.9.5.8.js
@@ -1,8 +1,9 @@
+// |reftest| fails-if(Android)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma/Date/15.9.5.9.js
+++ b/js/src/tests/ecma/Date/15.9.5.9.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) -- bug 686143, skip temporarily to see what happens to the frequency and location of Android timeouts
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma/Date/dst-offset-caching-1-of-8.js
+++ b/js/src/tests/ecma/Date/dst-offset-caching-1-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| slow
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 runDSTOffsetCachingTestsFraction(1, 8);
--- a/js/src/tests/ecma/Date/dst-offset-caching-2-of-8.js
+++ b/js/src/tests/ecma/Date/dst-offset-caching-2-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| slow
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 runDSTOffsetCachingTestsFraction(2, 8);
--- a/js/src/tests/ecma/Date/dst-offset-caching-3-of-8.js
+++ b/js/src/tests/ecma/Date/dst-offset-caching-3-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| slow
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 runDSTOffsetCachingTestsFraction(3, 8);
--- a/js/src/tests/ecma/Date/dst-offset-caching-4-of-8.js
+++ b/js/src/tests/ecma/Date/dst-offset-caching-4-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| slow
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 runDSTOffsetCachingTestsFraction(4, 8);
--- a/js/src/tests/ecma/Date/dst-offset-caching-5-of-8.js
+++ b/js/src/tests/ecma/Date/dst-offset-caching-5-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| slow
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 runDSTOffsetCachingTestsFraction(5, 8);
--- a/js/src/tests/ecma/Date/dst-offset-caching-6-of-8.js
+++ b/js/src/tests/ecma/Date/dst-offset-caching-6-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| slow
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 runDSTOffsetCachingTestsFraction(6, 8);
--- a/js/src/tests/ecma/Date/dst-offset-caching-7-of-8.js
+++ b/js/src/tests/ecma/Date/dst-offset-caching-7-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| slow
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 runDSTOffsetCachingTestsFraction(7, 8);
--- a/js/src/tests/ecma/Date/dst-offset-caching-8-of-8.js
+++ b/js/src/tests/ecma/Date/dst-offset-caching-8-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| slow
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 runDSTOffsetCachingTestsFraction(8, 8);
deleted file mode 100644
--- a/js/src/tests/ecma/Date/jstests.list
+++ /dev/null
@@ -1,159 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/Date/
-script 15.9.1.1-1.js
-script 15.9.1.1-2.js
-script 15.9.1.13-1.js
-script 15.9.2.1.js
-script 15.9.2.2-1.js
-script 15.9.2.2-2.js
-script 15.9.2.2-3.js
-script 15.9.2.2-4.js
-script 15.9.2.2-5.js
-script 15.9.2.2-6.js
-script 15.9.3.1-1.js
-script 15.9.3.1-2.js
-script 15.9.3.1-3.js
-script 15.9.3.1-4.js
-script 15.9.3.1-5.js
-script 15.9.3.2-1.js
-script 15.9.3.2-2.js
-script 15.9.3.2-3.js
-script 15.9.3.2-4.js
-script 15.9.3.2-5.js
-script 15.9.3.8-1.js
-script 15.9.3.8-2.js
-script 15.9.3.8-3.js
-script 15.9.3.8-4.js
-script 15.9.3.8-5.js
-script 15.9.4.2-1.js
-script 15.9.4.2.js
-script 15.9.4.3.js
-script 15.9.5.1.js
-script 15.9.5.10-1.js
-script 15.9.5.10-10.js
-script 15.9.5.10-11.js
-script 15.9.5.10-12.js
-script 15.9.5.10-13.js
-script 15.9.5.10-2.js
-script 15.9.5.10-3.js
-script 15.9.5.10-4.js
-script 15.9.5.10-5.js
-script 15.9.5.10-6.js
-script 15.9.5.10-7.js
-script 15.9.5.10-8.js
-script 15.9.5.10-9.js
-script 15.9.5.11-1.js
-script 15.9.5.11-2.js
-script 15.9.5.11-3.js
-script 15.9.5.11-4.js
-script 15.9.5.11-5.js
-script 15.9.5.11-6.js
-script 15.9.5.11-7.js
-script 15.9.5.12-1.js
-skip-if(!xulRuntime.shell&&xulRuntime.OS=="Linux"&&xulRuntime.XPCOMABI.match(/x86_64/)) script 15.9.5.12-2.js # bug xxx crash
-script 15.9.5.12-3.js
-script 15.9.5.12-4.js
-script 15.9.5.12-5.js
-script 15.9.5.12-6.js
-script 15.9.5.12-7.js
-script 15.9.5.12-8.js
-script 15.9.5.13-1.js
-script 15.9.5.13-2.js
-script 15.9.5.13-3.js
-script 15.9.5.13-4.js
-script 15.9.5.13-5.js
-script 15.9.5.13-6.js
-script 15.9.5.13-7.js
-script 15.9.5.13-8.js
-random script 15.9.5.14.js
-script 15.9.5.15.js
-skip-if(!xulRuntime.shell&&xulRuntime.OS=="Linux"&&xulRuntime.XPCOMABI.match(/x86_64/)) script 15.9.5.16.js # bug xxx crash
-script 15.9.5.17.js
-script 15.9.5.18.js
-script 15.9.5.19.js
-script 15.9.5.2-1.js
-script 15.9.5.2-2-n.js
-script 15.9.5.2.js
-script 15.9.5.20.js
-script 15.9.5.21-1.js
-script 15.9.5.21-2.js
-script 15.9.5.21-3.js
-script 15.9.5.21-4.js
-script 15.9.5.21-5.js
-script 15.9.5.21-6.js
-script 15.9.5.21-7.js
-script 15.9.5.21-8.js
-script 15.9.5.22-1.js
-script 15.9.5.22-2.js
-script 15.9.5.22-3.js
-script 15.9.5.22-4.js
-script 15.9.5.22-5.js
-script 15.9.5.22-6.js
-script 15.9.5.22-7.js
-script 15.9.5.22-8.js
-script 15.9.5.23-1.js
-script 15.9.5.23-10.js
-script 15.9.5.23-11.js
-script 15.9.5.23-12.js
-script 15.9.5.23-13.js
-script 15.9.5.23-14.js
-script 15.9.5.23-15.js
-script 15.9.5.23-16.js
-script 15.9.5.23-17.js
-script 15.9.5.23-18.js
-script 15.9.5.23-2.js
-script 15.9.5.23-3-n.js
-script 15.9.5.23-4.js
-script 15.9.5.23-5.js
-script 15.9.5.23-6.js
-script 15.9.5.23-7.js
-script 15.9.5.23-8.js
-script 15.9.5.23-9.js
-script 15.9.5.24-1.js
-script 15.9.5.24-2.js
-script 15.9.5.24-3.js
-script 15.9.5.24-4.js
-script 15.9.5.24-5.js
-script 15.9.5.24-6.js
-script 15.9.5.24-7.js
-script 15.9.5.24-8.js
-script 15.9.5.25-1.js
-script 15.9.5.26-1.js
-script 15.9.5.27-1.js
-fails-if(Android) script 15.9.5.28-1.js
-fails-if(Android) script 15.9.5.29-1.js
-script 15.9.5.3-1-n.js
-script 15.9.5.3-2.js
-script 15.9.5.30-1.js
-script 15.9.5.31-1.js
-script 15.9.5.32-1.js
-script 15.9.5.33-1.js
-random script 15.9.5.34-1.js
-fails-if(Android) script 15.9.5.35-1.js
-script 15.9.5.36-1.js
-script 15.9.5.36-2.js
-script 15.9.5.36-3.js
-script 15.9.5.36-4.js
-script 15.9.5.36-5.js
-script 15.9.5.36-6.js
-script 15.9.5.36-7.js
-script 15.9.5.37-1.js
-script 15.9.5.37-2.js
-script 15.9.5.37-3.js
-script 15.9.5.37-4.js
-script 15.9.5.37-5.js
-script 15.9.5.4-1.js
-script 15.9.5.4-2-n.js
-script 15.9.5.5.js
-script 15.9.5.6.js
-script 15.9.5.7.js
-fails-if(Android) script 15.9.5.8.js
-skip-if(Android) script 15.9.5.9.js # bug 686143, skip temporarily to see what happens to the frequency and location of Android timeouts
-script 15.9.5.js
-slow script dst-offset-caching-1-of-8.js
-slow script dst-offset-caching-2-of-8.js
-slow script dst-offset-caching-3-of-8.js
-slow script dst-offset-caching-4-of-8.js
-slow script dst-offset-caching-5-of-8.js
-slow script dst-offset-caching-6-of-8.js
-slow script dst-offset-caching-7-of-8.js
-slow script dst-offset-caching-8-of-8.js
--- a/js/src/tests/ecma/ExecutionContexts/10.2.2-1.js
+++ b/js/src/tests/ecma/ExecutionContexts/10.2.2-1.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) -- bug - nsIDOMWindow.crypto throws NS_ERROR_NOT_IMPLEMENTED on Android
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma/ExecutionContexts/10.2.2-2.js
+++ b/js/src/tests/ecma/ExecutionContexts/10.2.2-2.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) -- bug - nsIDOMWindow.crypto throws NS_ERROR_NOT_IMPLEMENTED on Android
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/ecma/ExecutionContexts/jstests.list
+++ /dev/null
@@ -1,24 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/ExecutionContexts/
-script 10.1.3-1.js
-script 10.1.3-2.js
-script 10.1.3.js
-script 10.1.4-1.js
-script 10.1.4-10.js
-script 10.1.4-2.js
-script 10.1.4-3.js
-script 10.1.4-4.js
-script 10.1.4-5.js
-script 10.1.4-6.js
-script 10.1.4-7.js
-script 10.1.4-8.js
-script 10.1.5-1.js
-script 10.1.5-2.js
-script 10.1.5-3.js
-script 10.1.5-4.js
-script 10.1.8-2.js
-script 10.1.8-3.js
-script 10.2.1.js
-skip-if(Android) script 10.2.2-1.js # bug - nsIDOMWindow.crypto throws NS_ERROR_NOT_IMPLEMENTED on Android
-skip-if(Android) script 10.2.2-2.js # bug - nsIDOMWindow.crypto throws NS_ERROR_NOT_IMPLEMENTED on Android
-script 10.2.3-1.js
-script 10.2.3-2.js
deleted file mode 100644
--- a/js/src/tests/ecma/Expressions/jstests.list
+++ /dev/null
@@ -1,69 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/Expressions/
-script 11.1.1.js
-script 11.10-1.js
-script 11.10-2.js
-script 11.10-3.js
-script 11.12-1.js
-script 11.12-2-n.js
-script 11.12-3.js
-script 11.12-4.js
-script 11.13.1.js
-script 11.13.2-1.js
-script 11.13.2-2.js
-script 11.13.2-3.js
-script 11.13.2-4.js
-script 11.13.2-5.js
-script 11.13.js
-script 11.14-1.js
-script 11.2.1-1.js
-script 11.2.1-2.js
-script 11.2.1-3-n.js
-script 11.2.1-4-n.js
-script 11.2.1-5.js
-script 11.2.2-1-n.js
-script 11.2.2-1.js
-script 11.2.2-10-n.js
-script 11.2.2-11.js
-script 11.2.2-2-n.js
-script 11.2.2-3-n.js
-script 11.2.2-4-n.js
-script 11.2.2-5-n.js
-script 11.2.2-6-n.js
-script 11.2.2-7-n.js
-script 11.2.2-8-n.js
-script 11.2.2-9-n.js
-script 11.2.3-1.js
-script 11.2.3-2-n.js
-script 11.2.3-3-n.js
-script 11.2.3-4-n.js
-script 11.2.3-5.js
-script 11.3.1.js
-script 11.3.2.js
-script 11.4.1.js
-script 11.4.2.js
-script 11.4.3.js
-script 11.4.4.js
-script 11.4.5.js
-script 11.4.6.js
-script 11.4.7-01.js
-script 11.4.7-02.js
-script 11.4.8.js
-script 11.4.9.js
-script 11.5.1.js
-script 11.5.2.js
-script 11.5.3.js
-script 11.6.1-1.js
-script 11.6.1-2.js
-script 11.6.1-3.js
-script 11.6.2-1.js
-script 11.6.3.js
-script 11.7.1.js
-script 11.7.2.js
-script 11.7.3.js
-script 11.8.1.js
-script 11.8.2.js
-script 11.8.3.js
-script 11.8.4.js
-script 11.9.1.js
-script 11.9.2.js
-script 11.9.3.js
deleted file mode 100644
--- a/js/src/tests/ecma/FunctionObjects/jstests.list
+++ /dev/null
@@ -1,18 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/FunctionObjects/
-script 15.3.1.1-1.js
-script 15.3.1.1-2.js
-script 15.3.1.1-3.js
-script 15.3.2.1-1.js
-script 15.3.2.1-2.js
-script 15.3.2.1-3.js
-script 15.3.3.1-2.js
-script 15.3.3.1-3.js
-script 15.3.3.1-4.js
-script 15.3.3.2.js
-script 15.3.4-1.js
-script 15.3.4.1.js
-script 15.3.4.js
-script 15.3.5-1.js
-script 15.3.5-2.js
-script 15.3.5.1.js
-script 15.3.5.3.js
deleted file mode 100644
--- a/js/src/tests/ecma/GlobalObject/jstests.list
+++ /dev/null
@@ -1,16 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/GlobalObject/
-script 15.1-1-n.js
-script 15.1-2-n.js
-script 15.1.1.1.js
-script 15.1.1.2.js
-script 15.1.2.1-2.js
-script 15.1.2.2-1.js
-script 15.1.2.2-2.js
-script 15.1.2.3-1.js
-script 15.1.2.3-2.js
-script 15.1.2.4.js
-script 15.1.2.5-1.js
-script 15.1.2.5-2.js
-script 15.1.2.5-3.js
-script 15.1.2.6.js
-script 15.1.2.7.js
--- a/js/src/tests/ecma/LexicalConventions/7.4.3-3-n.js
+++ b/js/src/tests/ecma/LexicalConventions/7.4.3-3-n.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/ecma/LexicalConventions/jstests.list
+++ /dev/null
@@ -1,76 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/LexicalConventions/
-script 7.1-1.js
-script 7.1-2.js
-script 7.1-3.js
-script 7.2-1.js
-script 7.2-2-n.js
-script 7.2-3-n.js
-script 7.2-4-n.js
-script 7.2-5-n.js
-script 7.2-6.js
-script 7.3-1.js
-script 7.3-10.js
-script 7.3-11.js
-script 7.3-12.js
-script 7.3-13-n.js
-script 7.3-2.js
-script 7.3-3.js
-script 7.3-4.js
-script 7.3-5.js
-script 7.3-6.js
-script 7.3-7.js
-script 7.3-8.js
-script 7.3-9.js
-script 7.4.1-1-n.js
-script 7.4.1-2-n.js
-script 7.4.1-3-n.js
-script 7.4.2-1-n.js
-script 7.4.2-10-n.js
-script 7.4.2-11-n.js
-script 7.4.2-12-n.js
-script 7.4.2-13-n.js
-script 7.4.2-14-n.js
-script 7.4.2-15-n.js
-script 7.4.2-16-n.js
-script 7.4.2-2-n.js
-script 7.4.2-3-n.js
-script 7.4.2-4-n.js
-script 7.4.2-5-n.js
-script 7.4.2-6-n.js
-script 7.4.2-7-n.js
-script 7.4.2-8-n.js
-script 7.4.2-9-n.js
-script 7.4.3-1-n.js
-script 7.4.3-10-n.js
-script 7.4.3-11-n.js
-script 7.4.3-12-n.js
-script 7.4.3-13-n.js
-script 7.4.3-14-n.js
-script 7.4.3-15-n.js
-script 7.4.3-16-n.js
-script 7.4.3-2-n.js
-skip script 7.4.3-3-n.js # obsolete test
-script 7.4.3-4-n.js
-script 7.4.3-5-n.js
-script 7.4.3-6-n.js
-script 7.4.3-7-n.js
-script 7.4.3-8-n.js
-script 7.4.3-9-n.js
-script 7.5-1.js
-script 7.5-10-n.js
-script 7.5-2-n.js
-script 7.5-3-n.js
-script 7.5-4-n.js
-script 7.5-5-n.js
-script 7.5-6.js
-script 7.5-7.js
-script 7.5-8-n.js
-script 7.5-9-n.js
-script 7.6.js
-script 7.7.1.js
-script 7.7.2.js
-script 7.7.3-1.js
-script 7.7.3-2.js
-script 7.7.3.js
-script 7.7.4.js
-script 7.8.2-n.js
deleted file mode 100644
--- a/js/src/tests/ecma/Math/jstests.list
+++ /dev/null
@@ -1,39 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/Math/
-script 15.8-2-n.js
-script 15.8-3-n.js
-script 15.8.1.1-1.js
-script 15.8.1.1-2.js
-script 15.8.1.2-1.js
-script 15.8.1.2-2.js
-script 15.8.1.3-1.js
-script 15.8.1.3-2.js
-script 15.8.1.4-1.js
-script 15.8.1.4-2.js
-script 15.8.1.5-1.js
-script 15.8.1.5-2.js
-script 15.8.1.6-1.js
-script 15.8.1.6-2.js
-script 15.8.1.7-1.js
-script 15.8.1.7-2.js
-script 15.8.1.8-1.js
-script 15.8.1.8-2.js
-script 15.8.1.8-3.js
-script 15.8.1.js
-script 15.8.2.1.js
-script 15.8.2.10.js
-script 15.8.2.11.js
-script 15.8.2.12.js
-script 15.8.2.13.js
-script 15.8.2.14.js
-script 15.8.2.15.js
-script 15.8.2.16.js
-script 15.8.2.17.js
-script 15.8.2.18.js
-script 15.8.2.2.js
-script 15.8.2.3.js
-script 15.8.2.4.js
-script 15.8.2.5.js
-script 15.8.2.6.js
-script 15.8.2.7.js
-script 15.8.2.8.js
-script 15.8.2.9.js
deleted file mode 100644
deleted file mode 100644
--- a/js/src/tests/ecma/Number/jstests.list
+++ /dev/null
@@ -1,37 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/Number/
-script 15.7.1.js
-script 15.7.2.js
-script 15.7.3.1-1.js
-script 15.7.3.1-2.js
-script 15.7.3.1-3.js
-script 15.7.3.2-1.js
-script 15.7.3.2-2.js
-script 15.7.3.2-3.js
-script 15.7.3.2-4.js
-script 15.7.3.3-1.js
-script 15.7.3.3-2.js
-script 15.7.3.3-3.js
-script 15.7.3.3-4.js
-script 15.7.3.4-1.js
-script 15.7.3.4-2.js
-script 15.7.3.4-3.js
-script 15.7.3.4-4.js
-script 15.7.3.5-1.js
-script 15.7.3.5-2.js
-script 15.7.3.5-3.js
-script 15.7.3.5-4.js
-script 15.7.3.6-1.js
-script 15.7.3.6-2.js
-script 15.7.3.6-3.js
-script 15.7.3.6-4.js
-script 15.7.3.js
-script 15.7.4-1.js
-script 15.7.4.1.js
-script 15.7.4.2-1.js
-script 15.7.4.2-2-n.js
-script 15.7.4.2-3-n.js
-script 15.7.4.2-4.js
-script 15.7.4.3-1.js
-script 15.7.4.3-2.js
-script 15.7.4.3-3-n.js
-script 0x-without-following-hexdigits.js
deleted file mode 100644
--- a/js/src/tests/ecma/ObjectObjects/jstests.list
+++ /dev/null
@@ -1,14 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/ObjectObjects/
-script 15.2.1.1.js
-script 15.2.1.2.js
-script 15.2.2.1.js
-script 15.2.2.2.js
-script 15.2.3-1.js
-script 15.2.3.1-1.js
-script 15.2.3.1-2.js
-script 15.2.3.1-3.js
-script 15.2.3.1-4.js
-script 15.2.3.js
-script 15.2.4.1.js
-script 15.2.4.2.js
-script 15.2.4.3.js
deleted file mode 100644
--- a/js/src/tests/ecma/SourceText/jstests.list
+++ /dev/null
@@ -1,3 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/SourceText/
-script 6-1.js
-script 6-2.js
deleted file mode 100644
--- a/js/src/tests/ecma/Statements/jstests.list
+++ /dev/null
@@ -1,32 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/Statements/
-script 12.10-1.js
-script 12.10.js
-script 12.2-1.js
-script 12.5-1.js
-script 12.5-2.js
-script 12.6.1-1.js
-script 12.6.2-1.js
-script 12.6.2-2.js
-script 12.6.2-3.js
-script 12.6.2-4.js
-script 12.6.2-5.js
-script 12.6.2-6.js
-script 12.6.2-7.js
-script 12.6.2-8.js
-script 12.6.2-9-n.js
-script 12.6.3-1.js
-script 12.6.3-10.js
-script 12.6.3-11.js
-script 12.6.3-12.js
-script 12.6.3-19.js
-script 12.6.3-2.js
-script 12.6.3-3.js
-script 12.6.3-4.js
-script 12.6.3-5-n.js
-script 12.6.3-6-n.js
-script 12.6.3-7-n.js
-script 12.6.3-8-n.js
-script 12.6.3-9-n.js
-script 12.7-1-n.js
-script 12.8-1-n.js
-script 12.9-1-n.js
deleted file mode 100644
--- a/js/src/tests/ecma/String/jstests.list
+++ /dev/null
@@ -1,46 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/String/
-script 15.5.1.js
-script 15.5.2.js
-script 15.5.3.1-1.js
-script 15.5.3.1-2.js
-script 15.5.3.1-3.js
-script 15.5.3.1-4.js
-script 15.5.3.2-1.js
-script 15.5.3.2-2.js
-script 15.5.3.2-3.js
-script 15.5.3.js
-script 15.5.4.1.js
-script 15.5.4.10-1.js
-script 15.5.4.11-1.js
-script 15.5.4.11-3.js
-script 15.5.4.11-4.js
-script 15.5.4.11-6.js
-script 15.5.4.12-2.js
-script 15.5.4.12-3.js
-script 15.5.4.12-5.js
-script 15.5.4.2-1.js
-script 15.5.4.2-2-n.js
-script 15.5.4.2-3.js
-script 15.5.4.2.js
-script 15.5.4.3-1.js
-script 15.5.4.3-2.js
-script 15.5.4.3-3-n.js
-script 15.5.4.4-1.js
-script 15.5.4.4-2.js
-script 15.5.4.4-3.js
-script 15.5.4.4-4.js
-script 15.5.4.5-1.js
-script 15.5.4.5-2.js
-script 15.5.4.5-3.js
-script 15.5.4.5-4.js
-script 15.5.4.5-5.js
-script 15.5.4.6-1.js
-script 15.5.4.6-2.js
-script 15.5.4.7-1.js
-script 15.5.4.7-2.js
-script 15.5.4.8-1.js
-script 15.5.4.8-2.js
-script 15.5.4.8-3.js
-script 15.5.4.9-1.js
-script 15.5.4.js
-script 15.5.5.1.js
deleted file mode 100644
--- a/js/src/tests/ecma/TypeConversion/jstests.list
+++ /dev/null
@@ -1,14 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/TypeConversion/
-script 9.2.js
-script 9.3-1.js
-script 9.3.1-1.js
-script 9.3.1-2.js
-script 9.3.1-3.js
-script 9.3.js
-script 9.4-1.js
-script 9.4-2.js
-script 9.5-2.js
-script 9.6.js
-script 9.7.js
-script 9.8.1.js
-script 9.9-1.js
deleted file mode 100644
--- a/js/src/tests/ecma/Types/jstests.list
+++ /dev/null
@@ -1,4 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/Types/
-script 8.1.js
-script 8.4.js
-script 8.6.2.1-1.js
--- a/js/src/tests/ecma/browser.js
+++ b/js/src/tests/ecma/browser.js
@@ -1,62 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: MPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Mozilla Public License Version
- * 1.1 (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- * http://www.mozilla.org/MPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the MPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the MPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/*
- * JavaScript test library shared functions file for running the tests
- * in the browser.  Overrides the shell's print function with document.write
- * and make everything HTML pretty.
- *
- * To run the tests in the browser, use the mkhtml.pl script to generate
- * html pages that include the shell.js, browser.js (this file), and the
- * test js file in script tags.
- *
- * The source of the page that is generated should look something like this:
- *      <script src="./../shell.js"></script>
- *      <script src="./../browser.js"></script>
- *      <script src="./mytest.js"></script>
- */
-
-/*
- * The earlier versions of the test code used exceptions
- * to terminate the test script in "negative" test cases
- * before the failure reporting code could run. In order
- * to be able to capture errors for the "negative" case 
- * where the exception is a sign the test actually passed,
- * the err online handler will assume that any error is a 
- * failure unless gExceptionExpected is true.
- */
-
deleted file mode 100644
--- a/js/src/tests/ecma/extensions/jstests.list
+++ /dev/null
@@ -1,35 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma/extensions/
-script 10.1.4-9.js
-script 10.1.6.js
-script 10.1.8-1.js
-script 11.6.1-1.js
-script 11.6.1-2.js
-script 11.6.1-3.js
-script 11.6.2-1.js
-script 15-1.js
-script 15-2.js
-script 15.1.2.1-1.js
-script 15.2.1.1.js
-script 15.2.3-1.js
-script 15.2.4.js
-script 15.3.1.1-1.js
-script 15.3.1.1-2.js
-script 15.3.2.1-1.js
-script 15.3.2.1-2.js
-script 15.3.3.1-1.js
-script 15.4.3.js
-script 15.5.3.js
-script 15.5.4.2.js
-script 15.5.4.4-4.js
-script 15.5.4.5-6.js
-script 15.5.4.7-3.js
-script 15.6.3.1-5.js
-script 15.6.3.js
-script 15.6.4-2.js
-script 15.7.3.js
-script 15.7.4.js
-script 15.8-1.js
-script 15.9.5.js
-script 8.6.2.1-1.js
-script 9.9-1.js
-require-or(debugMode,skip) script trapflatclosure.js
--- a/js/src/tests/ecma/extensions/trapflatclosure.js
+++ b/js/src/tests/ecma/extensions/trapflatclosure.js
@@ -1,8 +1,9 @@
+// |reftest| require-or(debugMode,skip)
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 
 var BUGNUMBER = 549617;
 var summary = 'flat closure debugged via trap while still active';
 
deleted file mode 100644
--- a/js/src/tests/ecma/jstests.list
+++ /dev/null
@@ -1,18 +0,0 @@
-include Array/jstests.list
-include Boolean/jstests.list
-include Date/jstests.list
-include ExecutionContexts/jstests.list
-include Expressions/jstests.list
-include extensions/jstests.list
-include FunctionObjects/jstests.list
-include GlobalObject/jstests.list
-include LexicalConventions/jstests.list
-include Math/jstests.list
-include NativeObjects/jstests.list
-include Number/jstests.list
-include ObjectObjects/jstests.list
-include SourceText/jstests.list
-include Statements/jstests.list
-include String/jstests.list
-include TypeConversion/jstests.list
-include Types/jstests.list
deleted file mode 100644
--- a/js/src/tests/ecma_2/Exceptions/jstests.list
+++ /dev/null
@@ -1,103 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_2/Exceptions/
-script boolean-001.js
-script boolean-002.js
-script date-001.js
-script date-002.js
-script date-003.js
-script date-004.js
-script exception-001.js
-script exception-002.js
-script exception-003.js
-script exception-004.js
-script exception-005.js
-script exception-006.js
-script exception-007.js
-script exception-008.js
-script exception-009.js
-script exception-010-n.js
-script exception-011-n.js
-script expression-001.js
-script expression-002.js
-script expression-003.js
-script expression-004.js
-script expression-005.js
-script expression-006.js
-script expression-007.js
-script expression-008.js
-script expression-009.js
-script expression-010.js
-script expression-011.js
-script expression-012.js
-script expression-013.js
-script expression-014.js
-script expression-015.js
-script expression-016.js
-script expression-017.js
-script expression-019.js
-script function-001.js
-script global-001.js
-script global-002.js
-script lexical-001.js
-script lexical-002.js
-script lexical-003.js
-script lexical-004.js
-script lexical-005.js
-script lexical-006.js
-script lexical-007.js
-script lexical-008.js
-script lexical-009.js
-skip script lexical-010.js # obsolete test
-script lexical-011.js
-script lexical-012.js
-script lexical-013.js
-script lexical-014.js
-script lexical-015.js
-script lexical-016.js
-script lexical-017.js
-script lexical-018.js
-script lexical-019.js
-script lexical-020.js
-script lexical-021.js
-skip script lexical-022.js # obsolete test
-script lexical-023.js
-script lexical-024.js
-script lexical-025.js
-script lexical-026.js
-script lexical-027.js
-script lexical-028.js
-script lexical-029.js
-script lexical-030.js
-script lexical-031.js
-script lexical-032.js
-script lexical-033.js
-script lexical-034.js
-script lexical-035.js
-script lexical-036.js
-script lexical-037.js
-script lexical-038.js
-script lexical-039.js
-script lexical-040.js
-script lexical-041.js
-script lexical-042.js
-script lexical-047.js
-script lexical-048.js
-script lexical-049.js
-script lexical-050.js
-script lexical-051.js
-script lexical-052.js
-script lexical-053.js
-script lexical-054.js
-script number-001.js
-script number-002.js
-script number-003.js
-script statement-001.js
-script statement-002.js
-script statement-003.js
-script statement-004.js
-script statement-005.js
-script statement-006.js
-script statement-007.js
-script statement-008.js
-script statement-009.js
-script string-001.js
-script string-002.js
--- a/js/src/tests/ecma_2/Exceptions/lexical-010.js
+++ b/js/src/tests/ecma_2/Exceptions/lexical-010.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma_2/Exceptions/lexical-022.js
+++ b/js/src/tests/ecma_2/Exceptions/lexical-022.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/ecma_2/Expressions/jstests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_2/Expressions/
-script StrictEquality-001.js
deleted file mode 100644
--- a/js/src/tests/ecma_2/FunctionObjects/jstests.list
+++ /dev/null
@@ -1,3 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_2/FunctionObjects/
-script apply-001-n.js
-script call-1.js
deleted file mode 100644
--- a/js/src/tests/ecma_2/LexicalConventions/jstests.list
+++ /dev/null
@@ -1,4 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_2/LexicalConventions/
-script keywords-001.js
-script regexp-literals-001.js
-script regexp-literals-002.js
--- a/js/src/tests/ecma_2/RegExp/exec-001.js
+++ b/js/src/tests/ecma_2/RegExp/exec-001.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/ecma_2/RegExp/jstests.list
+++ /dev/null
@@ -1,15 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_2/RegExp/
-script constructor-001.js
-skip script exec-001.js # obsolete test
-script exec-002.js
-script function-001.js
-script hex-001.js
-script multiline-001.js
-script octal-001.js
-script octal-002.js
-script octal-003.js
-script properties-001.js
-script properties-002.js
-script regexp-enumerate-001.js
-script regress-001.js
-script unicode-001.js
--- a/js/src/tests/ecma_2/Statements/forin-002.js
+++ b/js/src/tests/ecma_2/Statements/forin-002.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) -- bug - nsIDOMWindow.crypto throws NS_ERROR_NOT_IMPLEMENTED on Android
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/ecma_2/Statements/jstests.list
+++ /dev/null
@@ -1,31 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_2/Statements/
-script dowhile-001.js
-script dowhile-002.js
-script dowhile-003.js
-script dowhile-004.js
-script dowhile-005.js
-script dowhile-006.js
-script dowhile-007.js
-script forin-001.js
-skip-if(Android) script forin-002.js # bug - nsIDOMWindow.crypto throws NS_ERROR_NOT_IMPLEMENTED on Android
-script if-001.js
-script label-001.js
-script label-002.js
-script switch-001.js
-script switch-002.js
-script switch-003.js
-script switch-004.js
-script try-001.js
-script try-003.js
-script try-004.js
-script try-005.js
-script try-006.js
-script try-007.js
-script try-008.js
-script try-009.js
-script try-010.js
-script try-012.js
-script while-001.js
-script while-002.js
-script while-003.js
-script while-004.js
deleted file mode 100644
--- a/js/src/tests/ecma_2/String/jstests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_2/String/
-script match-001.js
-script match-002.js
-script match-003.js
-script match-004.js
-skip script replace-001.js # obsolete test
-script split-001.js
-script split-002.js
-script split-003.js
--- a/js/src/tests/ecma_2/String/replace-001.js
+++ b/js/src/tests/ecma_2/String/replace-001.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/ecma_2/extensions/jstests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_2/extensions/
-script constructor-001.js
-script function-001.js
-script instanceof-001.js
-script instanceof-002.js
-script instanceof-003-n.js
-script instanceof-004-n.js
-script instanceof-005-n.js
-script instanceof-006.js
deleted file mode 100644
--- a/js/src/tests/ecma_2/instanceof/jstests.list
+++ /dev/null
@@ -1,5 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_2/instanceof/
-script instanceof-001.js
-script instanceof-002.js
-script instanceof-003.js
-script regress-7635.js
deleted file mode 100644
--- a/js/src/tests/ecma_2/jstests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-include Exceptions/jstests.list
-include Expressions/jstests.list
-include extensions/jstests.list
-include FunctionObjects/jstests.list
-include instanceof/jstests.list
-include LexicalConventions/jstests.list
-include RegExp/jstests.list
-include Statements/jstests.list
-include String/jstests.list
deleted file mode 100644
--- a/js/src/tests/ecma_3/Array/jstests.list
+++ /dev/null
@@ -1,18 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/Array/
-script 15.4.4.11-01.js
-script 15.4.4.3-1.js
-script 15.4.4.4-001.js
-script 15.4.5.1-01.js
-script 15.5.4.8-01.js
-script regress-101488.js
-script regress-130451.js
-script regress-322135-01.js
-script regress-322135-02.js
-skip script regress-322135-03.js # slow
-skip script regress-322135-04.js # slow
-script regress-387501.js
-script regress-390598.js
-script regress-421325.js
-script regress-430717.js
-script regress-488989.js
-script regress-619970.js
--- a/js/src/tests/ecma_3/Array/regress-322135-03.js
+++ b/js/src/tests/ecma_3/Array/regress-322135-03.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma_3/Array/regress-322135-04.js
+++ b/js/src/tests/ecma_3/Array/regress-322135-04.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma_3/Date/15.9.5.5.js
+++ b/js/src/tests/ecma_3/Date/15.9.5.5.js
@@ -1,8 +1,9 @@
+// |reftest| random-if(xulRuntime.OS=="Linux")
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/ecma_3/Date/jstests.list
+++ /dev/null
@@ -1,11 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/Date/
-script 15.9.1.2-01.js
-script 15.9.3.2-1.js
-script 15.9.4.3.js
-script 15.9.5.3.js
-script 15.9.5.4.js
-script 15.9.5.5-02.js
-random-if(xulRuntime.OS=="Linux") script 15.9.5.5.js
-script 15.9.5.6.js
-script 15.9.5.7.js
-script regress-452786.js
deleted file mode 100644
--- a/js/src/tests/ecma_3/Exceptions/jstests.list
+++ /dev/null
@@ -1,12 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/Exceptions/
-script 15.11.1.1.js
-script 15.11.4.4-1.js
-script 15.11.5.js
-script 15.11.7.6-001.js
-script 15.11.7.6-002.js
-script 15.11.7.6-003.js
-script binding-001.js
-script regress-181654.js
-script regress-181914.js
-script regress-58946.js
-script regress-95101.js
deleted file mode 100644
--- a/js/src/tests/ecma_3/ExecutionContexts/jstests.list
+++ /dev/null
@@ -1,8 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/ExecutionContexts/
-script 10.1.3-1.js
-script 10.1.3-2.js
-script 10.1.3.js
-script 10.1.4-1.js
-script 10.6.1-01.js
-script regress-23346.js
-script regress-448595-01.js
deleted file mode 100644
--- a/js/src/tests/ecma_3/Expressions/jstests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/Expressions/
-script 11.10-01.js
-script 11.10-02.js
-script 11.10-03.js
-script 11.6.1-1.js
-script 11.7.1-01.js
-script 11.7.2-01.js
-script 11.7.3-01.js
-script 11.9.6-1.js
deleted file mode 100644
--- a/js/src/tests/ecma_3/FunExpr/jstests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/FunExpr/
-script fe-001-n.js
-script fe-001.js
-script fe-002.js
-script regress-518103.js
-script regress-524826.js
-script regress-528082.js
-script regress-533254.js
-script regress-545980.js
deleted file mode 100644
--- a/js/src/tests/ecma_3/Function/jstests.list
+++ /dev/null
@@ -1,17 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/Function/
-script 15.3.4.3-1.js
-script 15.3.4.4-1.js
-script arguments-001.js
-script arguments-002.js
-script call-001.js
-script regress-131964.js
-script regress-137181.js
-script regress-193555.js
-script regress-313570.js
-script regress-49286.js
-script regress-58274.js
-script regress-85880.js
-script regress-94506.js
-script regress-97921.js
-script scope-001.js
-script scope-002.js
deleted file mode 100644
--- a/js/src/tests/ecma_3/LexicalConventions/jstests.list
+++ /dev/null
@@ -1,4 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/LexicalConventions/
-script 7.4-01.js
-script 7.8.3-01.js
-script 7.9.1.js
--- a/js/src/tests/ecma_3/Number/15.7.4.6-1.js
+++ b/js/src/tests/ecma_3/Number/15.7.4.6-1.js
@@ -1,8 +1,9 @@
+// |reftest| fails
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma_3/Number/15.7.4.7-1.js
+++ b/js/src/tests/ecma_3/Number/15.7.4.7-1.js
@@ -1,8 +1,9 @@
+// |reftest| fails
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/ecma_3/Number/jstests.list
+++ /dev/null
@@ -1,10 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/Number/
-script 15.7.4.2-01.js
-script 15.7.4.3-01.js
-script 15.7.4.3-02.js
-script 15.7.4.5-1.js
-script 15.7.4.5-2.js
-fails script 15.7.4.6-1.js
-fails script 15.7.4.7-1.js
-script 15.7.4.7-2.js
-script regress-442242-01.js
deleted file mode 100644
--- a/js/src/tests/ecma_3/NumberFormatting/jstests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/NumberFormatting/
-script tostring-001.js
deleted file mode 100644
--- a/js/src/tests/ecma_3/Object/jstests.list
+++ /dev/null
@@ -1,14 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/Object/
-script 8.6.1-01.js
-script 8.6.2.6-001.js
-script 8.6.2.6-002.js
-script class-001.js
-script class-002.js
-script class-003.js
-script class-004.js
-script class-005.js
-script regress-361274.js
-script regress-385393-07.js
-script regress-459405.js
-script regress-72773.js
-script regress-79129-001.js
deleted file mode 100644
--- a/js/src/tests/ecma_3/Operators/jstests.list
+++ /dev/null
@@ -1,6 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/Operators/
-script 11.13.1-001.js
-script 11.13.1-002.js
-script 11.4.1-001.js
-script 11.4.1-002.js
-script order-01.js
deleted file mode 100644
--- a/js/src/tests/ecma_3/RegExp/jstests.list
+++ /dev/null
@@ -1,69 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/RegExp/
-script 15.10.2-1.js
-script 15.10.2.12.js
-script 15.10.3.1-1.js
-script 15.10.3.1-2.js
-script 15.10.4.1-1.js
-script 15.10.4.1-2.js
-script 15.10.4.1-3.js
-script 15.10.4.1-4.js
-script 15.10.4.1-5-n.js
-script 15.10.4.1-6.js
-script 15.10.6.2-1.js
-script 15.10.6.2-2.js
-script octal-001.js
-script octal-002.js
-script perlstress-001.js
-script perlstress-002.js
-script regress-100199.js
-script regress-105972.js
-script regress-119909.js
-script regress-122076.js
-script regress-123437.js
-script regress-165353.js
-script regress-169497.js
-script regress-169534.js
-script regress-187133.js
-script regress-188206.js
-script regress-191479.js
-script regress-202564.js
-script regress-209067.js
-script regress-209919.js
-script regress-216591.js
-script regress-220367-001.js
-script regress-223273.js
-script regress-223535.js
-script regress-224676.js
-script regress-225289.js
-script regress-225343.js
-script regress-24712.js
-script regress-285219.js
-script regress-28686.js
-random script regress-289669.js # BigO
-skip script regress-307456.js # slow
-script regress-309840.js
-random script regress-311414.js # BigO
-script regress-312351.js
-script regress-31316.js
-skip script regress-330684.js # slow
-script regress-334158.js
-script regress-346090.js
-script regress-367888.js
-script regress-375642.js
-script regress-375651.js
-script regress-375711.js
-script regress-375715-01-n.js
-script regress-375715-02.js
-script regress-375715-03.js
-script regress-375715-04.js
-script regress-436700.js
-script regress-465862.js
-script regress-57572.js
-script regress-57631.js
-script regress-67773.js
-script regress-72964.js
-script regress-76683.js
-script regress-78156.js
-random script regress-85721.js # bogus perf test (bug 467263)
-script regress-87231.js
-script regress-98306.js
--- a/js/src/tests/ecma_3/RegExp/regress-289669.js
+++ b/js/src/tests/ecma_3/RegExp/regress-289669.js
@@ -1,8 +1,9 @@
+// |reftest| random -- BigO
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma_3/RegExp/regress-307456.js
+++ b/js/src/tests/ecma_3/RegExp/regress-307456.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma_3/RegExp/regress-311414.js
+++ b/js/src/tests/ecma_3/RegExp/regress-311414.js
@@ -1,8 +1,9 @@
+// |reftest| random -- BigO
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma_3/RegExp/regress-330684.js
+++ b/js/src/tests/ecma_3/RegExp/regress-330684.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma_3/RegExp/regress-85721.js
+++ b/js/src/tests/ecma_3/RegExp/regress-85721.js
@@ -1,8 +1,9 @@
+// |reftest| random -- bogus perf test (bug 467263)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/ecma_3/Regress/jstests.list
+++ /dev/null
@@ -1,8 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/Regress/
-script regress-385393-04.js
-script regress-419152.js
-script regress-420087.js
-script regress-420610.js
-script regress-441477-01.js
-script regress-469937.js
-script regress-580544.js
deleted file mode 100644
--- a/js/src/tests/ecma_3/Statements/jstests.list
+++ /dev/null
@@ -1,19 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/Statements/
-script 12.10-01.js
-script 12.6.3.js
-skip script regress-121744.js # obsolete test
-script regress-131348.js
-script regress-157509.js
-script regress-194364.js
-script regress-226517.js
-script regress-302439.js
-script regress-324650.js
-script regress-444979.js
-script regress-74474-001.js
-script regress-74474-002.js
-script regress-74474-003.js
-script regress-83532-001.js
-script regress-83532-002.js
-script regress-642975.js
-script switch-001.js
-script switch-002.js
--- a/js/src/tests/ecma_3/Statements/regress-121744.js
+++ b/js/src/tests/ecma_3/Statements/regress-121744.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/ecma_3/String/15.5.4.11.js
+++ b/js/src/tests/ecma_3/String/15.5.4.11.js
@@ -1,8 +1,9 @@
+// |reftest| fails
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
  *
deleted file mode 100644
--- a/js/src/tests/ecma_3/String/jstests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/String/
-fails script 15.5.4.11.js
-script 15.5.4.14.js
-script regress-104375.js
-script regress-189898.js
-script regress-304376.js
-script regress-313567.js
-fails script regress-392378.js
-script regress-83293.js
--- a/js/src/tests/ecma_3/String/regress-392378.js
+++ b/js/src/tests/ecma_3/String/regress-392378.js
@@ -1,8 +1,9 @@
+// |reftest| fails
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/ecma_3/Unicode/jstests.list
+++ /dev/null
@@ -1,10 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/Unicode/
-script regress-352044-01.js
-script regress-352044-02-n.js
-script uc-001-n.js
-skip script uc-001.js # obsolete test
-script uc-002-n.js
-script uc-002.js
-script uc-003.js
-script uc-004.js
-script uc-005.js
--- a/js/src/tests/ecma_3/Unicode/uc-001.js
+++ b/js/src/tests/ecma_3/Unicode/uc-001.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 8; indent-tabs-mode: nil; c-basic-offset: 4 -*-
  *
  * ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
deleted file mode 100644
--- a/js/src/tests/ecma_3/extensions/jstests.list
+++ /dev/null
@@ -1,15 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3/extensions/
-script 10.1.3-2.js
-script 7.9.1.js
-script regress-103087.js
-script regress-188206-01.js
-script regress-188206-02.js
-script regress-220367-002.js
-script regress-228087.js
-script regress-274152.js
-script regress-320854.js
-script regress-327170.js
-script regress-368516.js
-script regress-385393-03.js
-require-or(debugMode,skip) script regress-429248.js
-script regress-430740.js
--- a/js/src/tests/ecma_3/extensions/regress-429248.js
+++ b/js/src/tests/ecma_3/extensions/regress-429248.js
@@ -1,8 +1,9 @@
+// |reftest| require-or(debugMode,skip)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/ecma_3/jstests.list
+++ /dev/null
@@ -1,18 +0,0 @@
-include Array/jstests.list
-include Date/jstests.list
-include Exceptions/jstests.list
-include ExecutionContexts/jstests.list
-include Expressions/jstests.list
-include extensions/jstests.list
-include Function/jstests.list
-include FunExpr/jstests.list
-include LexicalConventions/jstests.list
-include Number/jstests.list
-include NumberFormatting/jstests.list
-include Object/jstests.list
-include Operators/jstests.list
-include RegExp/jstests.list
-include Regress/jstests.list
-include Statements/jstests.list
-include String/jstests.list
-include Unicode/jstests.list
deleted file mode 100644
--- a/js/src/tests/ecma_3_1/Object/jstests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3_1/Object/
-script regress-444787.js
deleted file mode 100644
--- a/js/src/tests/ecma_3_1/RegExp/jstests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3_1/RegExp/
-fails script regress-305064.js
--- a/js/src/tests/ecma_3_1/RegExp/regress-305064.js
+++ b/js/src/tests/ecma_3_1/RegExp/regress-305064.js
@@ -1,8 +1,9 @@
+// |reftest| fails
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/ecma_3_1/extensions/jstests.list
+++ /dev/null
@@ -1,1 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_3_1/extensions/
deleted file mode 100644
--- a/js/src/tests/ecma_3_1/jstests.list
+++ /dev/null
@@ -1,3 +0,0 @@
-include extensions/jstests.list
-include Object/jstests.list
-include RegExp/jstests.list
deleted file mode 100644
--- a/js/src/tests/ecma_5/Array/jstests.list
+++ /dev/null
@@ -1,12 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/Array/
-script join-01.js
-script length-01.js
-script length-set-object.js
-script regress-599159.js
-script sort-01.js
-script splice-return-array-elements-defined-not-set.js
-script splice-suppresses-unvisited-indexes.js
-script toLocaleString-01.js
-script toString-01.js
-script unshift-01.js
-script index-with-null-character.js
deleted file mode 100644
--- a/js/src/tests/ecma_5/Boolean/jstests.list
+++ /dev/null
@@ -1,3 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/Boolean/
-script 15.6.4.2.js
-script no-boolean-toJSON.js
deleted file mode 100644
--- a/js/src/tests/ecma_5/Date/jstests.list
+++ /dev/null
@@ -1,7 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/Date/
-script 15.9.4.2.js
-script defaultvalue.js
-script equality-to-boolean.js
-script toJSON-01.js
-script toISOString.js
-script setTime-argument-shortcircuiting.js
deleted file mode 100644
--- a/js/src/tests/ecma_5/Exceptions/jstests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/Exceptions/
-script error-property-enumerability.js
deleted file mode 100644
--- a/js/src/tests/ecma_5/Expressions/jstests.list
+++ /dev/null
@@ -1,8 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/Expressions/
-script 11.1.5-01.js
-script named-accessor-function.js
-script nested-delete-name-in-evalcode.js
-script object-literal-accessor-arguments.js
-script object-literal-accessor-property-name.js
-script primitive-this-boxing-behavior.js
-script string-literal-escape-sequences.js
--- a/js/src/tests/ecma_5/Function/Function-arguments-gc.js
+++ b/js/src/tests/ecma_5/Function/Function-arguments-gc.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android)
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  * Contributor:
  *   Christian Holler <decoder@own-hero.net>
  */
 
 //-----------------------------------------------------------------------------
deleted file mode 100644
--- a/js/src/tests/ecma_5/Function/jstests.list
+++ /dev/null
@@ -1,13 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/Function/
-script 10.2.1.1.6.js
-script 15.3.4.3-01.js
-script arguments-caller-callee.js
-script function-caller.js
-script strict-arguments.js
-script arguments-property-attributes.js
-script function-bind.js
-script function-call.js
-script redefine-arguments-length.js
-script builtin-no-prototype.js
-skip-if(Android) script Function-arguments-gc.js
-script builtin-no-construct.js
--- a/js/src/tests/ecma_5/Global/adding-global-var-nonextensible-error.js
+++ b/js/src/tests/ecma_5/Global/adding-global-var-nonextensible-error.js
@@ -1,8 +1,9 @@
+// |reftest| fails-if(!xulRuntime.shell)
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 621432;
 var summary =
   "If a var statement can't create a global property because the global " +
   "object isn't extensible, and an error is thrown while decompiling the " +
--- a/js/src/tests/ecma_5/Global/cross-global-implicit-this.js
+++ b/js/src/tests/ecma_5/Global/cross-global-implicit-this.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell)
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 671947;
 var summary = "Unqualified function invocation uses the global object of the called property as |this|";
 var actual = "------------------------";
 var expect = "ooaoboabuuaubuabooaoboab";
deleted file mode 100644
--- a/js/src/tests/ecma_5/Global/jstests.list
+++ /dev/null
@@ -1,14 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/Global/
-fails-if(!xulRuntime.shell) script adding-global-var-nonextensible-error.js
-skip-if(!xulRuntime.shell) script cross-global-implicit-this.js
-script parseInt-01.js
-script parseFloat-01.js
-script eval-01.js
-script eval-02.js
-script eval-inside-with-is-direct.js
-script parenthesized-eval-is-direct.js
-script eval-native-callback-is-indirect.js
-script direct-eval-but-not.js
-script eval-in-strict-eval-in-normal-function.js
-script bug660612.js
-script decodeURI-decodes-FFFE-FFFF.js
deleted file mode 100644
--- a/js/src/tests/ecma_5/JSON/jstests.list
+++ /dev/null
@@ -1,35 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/JSON/
-script cyclic-stringify.js
-script small-codepoints.js
-script parse.js
-script parse-arguments.js
-script parse-crockford-01.js
-script parse-mega-huge-array.js
-script parse-number-syntax.js
-script parse-octal-syntax-error.js
-script parse-primitives.js
-script parse-reviver.js
-script parse-reviver-array-delete.js
-script parse-syntax-errors-01.js
-script parse-syntax-errors-02.js
-script parse-syntax-errors-03.js
-script stringify.js
-script stringify-boxed-primitives.js
-script stringify-call-replacer-once.js
-script stringify-call-toJSON-once.js
-script stringify-dropping-elements.js
-script stringify-gap.js
-script stringify-ignore-noncallable-toJSON.js
-script stringify-missing-arguments.js
-script stringify-nonarray-noncallable-replacer.js
-script stringify-primitives.js
-script stringify-replacer.js
-script stringify-replacer-array-boxed-elements.js
-script stringify-replacer-array-duplicated-element.js
-script stringify-replacer-array-edgecase-jsid-elements.js
-script stringify-replacer-array-hijinks.js
-script stringify-replacer-array-skipped-element.js
-script stringify-replacer-with-array-indexes.js
-script stringify-special-escapes.js
-script stringify-toJSON-arguments.js
-script trailing-comma.js
deleted file mode 100644
--- a/js/src/tests/ecma_5/Number/jstests.list
+++ /dev/null
@@ -1,4 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/Number/
-script 15.7.4.2.js
-script defaultvalue.js
-script toString-radix-handling.js
--- a/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-1-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-1-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(1, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-2-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-2-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(2, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-3-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-3-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(3, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-4-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-4-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(4, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-5-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-5-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(5, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-6-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-6-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(6, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-7-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-7-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(7, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-8-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-dictionary-redefinition-8-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runDictionaryPropertyPresentTestsFraction(8, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-function-length.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-function-length.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 430133;
 var summary = 'ES5 Object.defineProperty(O, P, Attributes): Function.length';
 
 print(BUGNUMBER + ": " + summary);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-1-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-1-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(1, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-2-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-2-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(2, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-3-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-3-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(3, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-4-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-4-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(4, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-5-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-5-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(5, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-6-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-6-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(6, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-7-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-7-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(7, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-8-of-8.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-middle-redefinition-8-of-8.js
@@ -1,5 +1,6 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 load("ecma_5/Object/defineProperty-setup.js");
 runNonTerminalPropertyPresentTestsFraction(8, 8);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-new-definition.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-new-definition.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 430133;
 var summary = 'ES5 Object.defineProperty(O, P, Attributes): new definition';
 
 print(BUGNUMBER + ": " + summary);
--- a/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-1-of-4.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-1-of-4.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 var PART = 1, PARTS = 4;
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 430133;
 var summary =
--- a/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-2-of-4.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-2-of-4.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 var PART = 2, PARTS = 4;
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 430133;
 var summary =
--- a/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-3-of-4.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-3-of-4.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 var PART = 3, PARTS = 4;
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 430133;
 var summary =
--- a/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-4-of-4.js
+++ b/js/src/tests/ecma_5/Object/15.2.3.6-redefinition-4-of-4.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses shell load() function
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 var PART = 4, PARTS = 4;
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 430133;
 var summary =
--- a/js/src/tests/ecma_5/Object/defineProperty-setup.js
+++ b/js/src/tests/ecma_5/Object/defineProperty-setup.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- not a test.
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 assertEq("defineProperty" in Object, true);
 assertEq(Object.defineProperty.length, 3);
 
 /*
  * Disable an assertion that is pathologically slow given the exhaustiveness of
--- a/js/src/tests/ecma_5/Object/freeze-global-eval-const.js
+++ b/js/src/tests/ecma_5/Object/freeze-global-eval-const.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) -- uses evalcx
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 
 try {
     evalcx("Object.freeze(this); eval('const q;')");
 } catch (e) {
deleted file mode 100644
--- a/js/src/tests/ecma_5/Object/jstests.list
+++ /dev/null
@@ -1,49 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/Object/
-skip script defineProperty-setup.js # not a test.
-script 15.2.3.3-01.js
-script 15.2.3.4-01.js
-script 15.2.3.4-02.js
-script 15.2.3.4-03.js
-script 15.2.3.4-04.js
-script 15.2.3.5-01.js
-skip-if(!xulRuntime.shell) script 15.2.3.6-function-length.js # uses shell load() function
-script 15.2.3.6-miscellaneous.js
-skip-if(!xulRuntime.shell) script 15.2.3.6-new-definition.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-redefinition-1-of-4.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-redefinition-2-of-4.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-redefinition-3-of-4.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-redefinition-4-of-4.js # uses shell load() function
-script 15.2.3.7-01.js
-script 15.2.3.9.js
-script 15.2.3.12.js
-script extensibility-01.js
-script extensibility-02.js
-script 15.2.3.14-01.js # does not use reportCompare
-skip-if(!xulRuntime.shell) script 15.2.3.6-middle-redefinition-1-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-middle-redefinition-2-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-middle-redefinition-3-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-middle-redefinition-4-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-middle-redefinition-5-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-middle-redefinition-6-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-middle-redefinition-7-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-middle-redefinition-8-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-dictionary-redefinition-1-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-dictionary-redefinition-2-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-dictionary-redefinition-3-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-dictionary-redefinition-4-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-dictionary-redefinition-5-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-dictionary-redefinition-6-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-dictionary-redefinition-7-of-8.js # uses shell load() function
-skip-if(!xulRuntime.shell) script 15.2.3.6-dictionary-redefinition-8-of-8.js # uses shell load() function
-script 15.2.3.6-define-over-method.js
-script mutation-prevention-methods.js
-script object-toString-01.js
-script proto-property-change-writability-set.js
-script vacuous-accessor-unqualified-name.js
-script add-property-non-extensible.js
-skip-if(!xulRuntime.shell) script freeze-global-eval-const.js # uses evalcx
-script preventExtensions-idempotent.js
-script isPrototypeOf.js
-script propertyIsEnumerable.js
-script toLocaleString.js
-script gOPD-vs-prototype-accessor.js
deleted file mode 100644
--- a/js/src/tests/ecma_5/RegExp/jstests.list
+++ /dev/null
@@ -1,15 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/RegExp/
-script 7.8.5-01.js
-script 15.10.5-01.js
-script 15.10.7.5-01.js
-script empty-lookahead.js
-script exec.js
-script exec-lastIndex-ToInteger.js
-script regress-576828.js
-script regress-613820-1.js
-script regress-613820-2.js
-script regress-613820-3.js
-script regress-429241.js
-silentfail skip-if(!xulRuntime.shell&&(Android||xulRuntime.OS=="WINNT")) script regress-617935.js
-script instance-property-storage-introspection.js
-script regexp-space-character-class.js
--- a/js/src/tests/ecma_5/RegExp/regress-617935.js
+++ b/js/src/tests/ecma_5/RegExp/regress-617935.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell&&(Android||xulRuntime.OS=="WINNT")) silentfail
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  *
  * Author: Christian Holler <decoder@own-hero.net>
  */
 
 expectExitCode(0);
deleted file mode 100644
--- a/js/src/tests/ecma_5/String/jstests.list
+++ /dev/null
@@ -1,12 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/String/
-script 15.5.4.2.js
-script 15.5.4.7.js
-script 15.5.4.11-01.js
-script defaultvalue.js
-script match-defines-match-elements.js
-script split-01.js
-script split-undefined-separator.js
-script split-xregexp.js
-script string-object-length.js
-script string-space-trim.js
-script string-upper-lower-mapping.js
deleted file mode 100644
--- a/js/src/tests/ecma_5/Types/jstests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/Types/
-script 8.12.5-01.js
deleted file mode 100644
--- a/js/src/tests/ecma_5/eval/jstests.list
+++ /dev/null
@@ -1,50 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/eval/
-#
-# A dazzling variety of characteristics of an invocation of the eval function
-# affect its semantics:
-#
-#  - Is it called from a function (one written by the user, or one provided by
-#    ES5), from global code, or from nothing (e.g. setTimeout, setInterval, or
-#    at the entry point to the JSAPI)?
-#  - If it is called from script (whether global or function), is the caller
-#    strict mode code?
-#  - Is the call direct or indirect?  (ES5 15.1.2.1)
-#  - Is the eval code itself strict mode?
-#
-# We test all of these in their basic configurations in an attempt to verify
-# correct general behavior.  These tests won't help any special-case
-# optimizations we might perform -- add new tests for such changes as needed.
-#
-
-script exhaustive-fun-normalcaller-direct-normalcode.js
-script exhaustive-fun-normalcaller-direct-strictcode.js
-script exhaustive-fun-normalcaller-indirect-normalcode.js
-script exhaustive-fun-normalcaller-indirect-strictcode.js
-script exhaustive-fun-strictcaller-direct-normalcode.js
-script exhaustive-fun-strictcaller-direct-strictcode.js
-script exhaustive-fun-strictcaller-indirect-normalcode.js
-script exhaustive-fun-strictcaller-indirect-strictcode.js
-script exhaustive-global-normalcaller-direct-normalcode.js
-script exhaustive-global-normalcaller-direct-strictcode.js
-script exhaustive-global-normalcaller-indirect-normalcode.js
-script exhaustive-global-normalcaller-indirect-strictcode.js
-script exhaustive-global-strictcaller-direct-normalcode.js
-script exhaustive-global-strictcaller-direct-strictcode.js
-script exhaustive-global-strictcaller-indirect-normalcode.js
-script exhaustive-global-strictcaller-indirect-strictcode.js
-
-# Not written yet!  These require a new shell primitive to work there, though
-# browser could probably use setTimeout for this.  Moreover, we haven't
-# implemented calling eval without a scripted frame yet (FIXME: bug 602994).
-# script exhaustive-nothing-normalcaller-direct-normalcode.js
-# script exhaustive-nothing-normalcaller-direct-strictcode.js
-# script exhaustive-nothing-normalcaller-indirect-normalcode.js
-# script exhaustive-nothing-normalcaller-indirect-strictcode.js
-# script exhaustive-nothing-strictcaller-direct-normalcode.js
-# script exhaustive-nothing-strictcaller-direct-strictcode.js
-# script exhaustive-nothing-strictcaller-indirect-normalcode.js
-# script exhaustive-nothing-strictcaller-indirect-strictcode.js
-
-script line-terminator-paragraph-terminator.js
-script strict-eval-json-object-repeated-property-name.js
-script undeclared-name-in-nested-strict-eval.js
--- a/js/src/tests/ecma_5/extensions/cross-global-eval-is-indirect.js
+++ b/js/src/tests/ecma_5/extensions/cross-global-eval-is-indirect.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) -- needs newGlobal()
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 608473;
 var summary =
--- a/js/src/tests/ecma_5/extensions/function-definition-with.js
+++ b/js/src/tests/ecma_5/extensions/function-definition-with.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) -- needs evaluate()
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 577325;
 var summary = 'Implement the ES5 algorithm for processing function statements';
deleted file mode 100644
--- a/js/src/tests/ecma_5/extensions/jstests.list
+++ /dev/null
@@ -1,44 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/extensions/
-script arguments-property-access-in-function.js
-script 8.12.5-01.js
-script 15.4.4.11.js
-script 15.9.4.2.js
-script Boolean-toSource.js
-script Number-toSource.js
-script Object-keys-and-object-ids.js
-script String-toSource.js
-script bug352085.js
-script bug472534.js
-script bug496985.js
-script bug566661.js
-script array-toString-recursion.js
-skip-if(!xulRuntime.shell) script cross-global-eval-is-indirect.js # needs newGlobal()
-script es5ish-defineGetter-defineSetter.js
-script eval-native-callback-is-indirect.js
-script extension-methods-reject-null-undefined-this.js
-script function-caller-skips-eval-frames.js
-skip-if(!xulRuntime.shell) script function-definition-with.js # needs evaluate()
-script function-properties.js
-script getOwnPropertyNames-__proto__.js
-script iterator-in-catch.js
-script JSON-string-replacer-overflow.js
-skip-if(!xulRuntime.shell) script legacy-JSON.js # needs parseLegacyJSON
-fails script nested-delete-name-in-evalcode.js # bug 604301, at a minimum
-script proxy-strict.js
-script regress-bug567606.js
-script regress-bug607284.js
-script regress-bug629723.js
-skip-if(!xulRuntime.shell) script strict-e4x-ban.js
-script strict-function-statements.js
-script strict-option-redeclared-parameter.js
-script string-literal-getter-setter-decompilation.js
-script String-methods-infinite-recursion.js
-script toLocaleString-infinite-recursion.js
-script toSource-infinite-recursion.js
-script uneval-strict-functions.js
-script watch-array-length.js
-script watch-inherited-property.js
-script watch-replaced-setter.js
-script watch-setter-become-setter.js
-script watch-value-prop-becoming-setter.js
-script watchpoint-deletes-JSPropertyOp-setter.js
--- a/js/src/tests/ecma_5/extensions/legacy-JSON.js
+++ b/js/src/tests/ecma_5/extensions/legacy-JSON.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) -- needs parseLegacyJSON
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 try
 {
   parseLegacyJSON("[,]");
   throw new Error("didn't throw");
 }
--- a/js/src/tests/ecma_5/extensions/nested-delete-name-in-evalcode.js
+++ b/js/src/tests/ecma_5/extensions/nested-delete-name-in-evalcode.js
@@ -1,8 +1,9 @@
+// |reftest| fails -- bug 604301, at a minimum
 // Any copyright is dedicated to the Public Domain.
 // http://creativecommons.org/licenses/publicdomain/
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 616294;
 var summary =
   "|delete x| inside a function in eval code, where that eval code includes " +
   "|var x| at top level, actually does delete the binding for x";
--- a/js/src/tests/ecma_5/extensions/strict-e4x-ban.js
+++ b/js/src/tests/ecma_5/extensions/strict-e4x-ban.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell)
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 
 assertEq(testLenientAndStrict("var o = {m:function(){}}; o.function::m()",
                               parsesSuccessfully,
                               parseRaisesException(SyntaxError)),
deleted file mode 100644
--- a/js/src/tests/ecma_5/jstests.list
+++ /dev/null
@@ -1,17 +0,0 @@
-include Array/jstests.list
-include Boolean/jstests.list
-include Date/jstests.list
-include eval/jstests.list
-include Exceptions/jstests.list
-include Expressions/jstests.list
-include Function/jstests.list
-include Global/jstests.list
-include JSON/jstests.list
-include Number/jstests.list
-include Object/jstests.list
-include RegExp/jstests.list
-include String/jstests.list
-include Types/jstests.list
-include extensions/jstests.list
-include misc/jstests.list
-include strict/jstests.list
--- a/js/src/tests/ecma_5/misc/function-definition-evaluate.js
+++ b/js/src/tests/ecma_5/misc/function-definition-evaluate.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) -- needs evaluate()
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  */
 
 //-----------------------------------------------------------------------------
 var BUGNUMBER = 577325;
 var summary = 'Implement the ES5 algorithm for processing function statements';
deleted file mode 100644
--- a/js/src/tests/ecma_5/misc/jstests.list
+++ /dev/null
@@ -1,20 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/misc/
-script global-numeric-properties.js
-script line-paragraph-separator-parse-as-lineterminator.js
-script redeclare-var-non-writable-property.js
-script syntax-error-end-of-for-head-part.js
-script enumerate-undefined.js
-script unwrapped-no-such-method.js
-script explicit-undefined-optional-argument.js
-script function-definition-eval.js
-skip-if(!xulRuntime.shell) script function-definition-evaluate.js # needs evaluate()
-script future-reserved-words.js
-script builtin-methods-reject-null-undefined-this.js
-script regress-bug632003.js
-script new-with-non-constructor.js
-script error-undefined-message.js
-script regexp-functions-with-undefined.js
-script unnamed-function.js
-script unicode-identifier-1d17.js
-script unicode-identifier-82f1.js
-script unicode-escaped-keyword.js
deleted file mode 100644
--- a/js/src/tests/ecma_5/strict/jstests.list
+++ /dev/null
@@ -1,44 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_5/strict/
-script 8.7.2.js
-script 8.12.5.js
-script 8.12.7.js
-script 10.4.2.js
-script 10.4.3.js
-script 10.6.js
-script 11.1.5.js
-script 11.3.1.js
-script 11.3.2.js
-script 11.4.1.js
-script 11.4.4.js
-script 11.4.5.js
-script 11.13.1.js
-script 11.13.2.js
-script 12.2.1.js
-script 12.10.1.js
-script 12.14.1.js
-script 13.1.js
-script 15.3.4.5.js
-script 15.3.5.1.js
-script 15.3.5.2.js
-script 15.4.4.6.js
-script 15.4.4.8.js
-script 15.4.4.9.js
-script 15.4.4.12.js
-script 15.4.4.13.js
-script 15.4.5.1.js
-script 15.5.5.1.js
-script 15.5.5.2.js
-script 15.10.7.js
-script B.1.1.js
-script B.1.2.js
-script function-name.js
-script primitive-this-no-writeback.js
-script regress-532254.js
-script regress-532041.js
-script regress-599159.js
-script unbrand-this.js
-script this-for-function-expression-recursion.js
-script assign-to-callee-name.js
-script directive-prologue-01.js
-script eval-variable-environment.js
-script strict-this-is-not-truthy.js
deleted file mode 100644
--- a/js/src/tests/ecma_6/Map/jstests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_6/Map/
-script NaN-as-key.js
deleted file mode 100644
--- a/js/src/tests/ecma_6/Set/jstests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-url-prefix ../../jsreftest.html?test=ecma_6/Set/
-script NaN-as-key.js
deleted file mode 100644
--- a/js/src/tests/ecma_6/jstests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-include Map/jstests.list
-include Set/jstests.list
--- a/js/src/tests/js-test-driver-begin.js
+++ b/js/src/tests/js-test-driver-begin.js
@@ -1,1 +0,0 @@
-/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
deleted file mode 100644
--- a/js/src/tests/js1_1/jstests.list
+++ /dev/null
@@ -1,1 +0,0 @@
-include regress/jstests.list
deleted file mode 100644
--- a/js/src/tests/js1_1/regress/jstests.list
+++ /dev/null
@@ -1,3 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_1/regress/
-script perfect.js
-script function-001.js
--- a/js/src/tests/js1_2/Array/array_split_1.js
+++ b/js/src/tests/js1_2/Array/array_split_1.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_2/Array/jstests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_2/Array/
-skip script array_split_1.js # obsolete test
-script general1.js
-script general2.js
-script slice.js
-script splice1.js
-script splice2.js
-skip script tostring_1.js # obsolete test
-skip script tostring_2.js # obsolete test
--- a/js/src/tests/js1_2/Array/tostring_1.js
+++ b/js/src/tests/js1_2/Array/tostring_1.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_2/Array/tostring_2.js
+++ b/js/src/tests/js1_2/Array/tostring_2.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_2/Objects/jstests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_2/Objects/
-skip script toString-001.js # obsolete test
--- a/js/src/tests/js1_2/Objects/toString-001.js
+++ b/js/src/tests/js1_2/Objects/toString-001.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_2/String/concat.js
+++ b/js/src/tests/js1_2/String/concat.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_2/String/jstests.list
+++ /dev/null
@@ -1,5 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_2/String/
-script charCodeAt.js
-skip script concat.js # obsolete test
-script match.js
-script slice.js
--- a/js/src/tests/js1_2/function/Function_object.js
+++ b/js/src/tests/js1_2/function/Function_object.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_2/function/Number.js
+++ b/js/src/tests/js1_2/function/Number.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_2/function/String.js
+++ b/js/src/tests/js1_2/function/String.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_2/function/function-001-n.js
+++ b/js/src/tests/js1_2/function/function-001-n.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_2/function/jstests.list
+++ /dev/null
@@ -1,13 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_2/function/
-skip script Function_object.js # obsolete test
-skip script Number.js # obsolete test
-skip script String.js # obsolete test
-script definition-1.js
-skip script function-001-n.js # obsolete test
-skip script length.js # obsolete test
-script nesting-1.js
-script nesting.js
-script regexparg-1.js
-skip script regexparg-2-n.js # obsolete test
-skip script tostring-1.js # obsolete test
-skip script tostring-2.js # obsolete test
--- a/js/src/tests/js1_2/function/length.js
+++ b/js/src/tests/js1_2/function/length.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_2/function/regexparg-2-n.js
+++ b/js/src/tests/js1_2/function/regexparg-2-n.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_2/function/tostring-1.js
+++ b/js/src/tests/js1_2/function/tostring-1.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_2/function/tostring-2.js
+++ b/js/src/tests/js1_2/function/tostring-2.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_2/jstests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-include Array/jstests.list
-include function/jstests.list
-include Objects/jstests.list
-include operator/jstests.list
-include regexp/jstests.list
-include regress/jstests.list
-include statements/jstests.list
-include String/jstests.list
-include version120/jstests.list
--- a/js/src/tests/js1_2/operator/equality.js
+++ b/js/src/tests/js1_2/operator/equality.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_2/operator/jstests.list
+++ /dev/null
@@ -1,3 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_2/operator/
-skip script equality.js # obsolete test
-script strictEquality.js
--- a/js/src/tests/js1_2/regexp/RegExp_lastIndex.js
+++ b/js/src/tests/js1_2/regexp/RegExp_lastIndex.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_2/regexp/jstests.list
+++ /dev/null
@@ -1,49 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_2/regexp/
-script RegExp_dollar_number.js
-skip script RegExp_lastIndex.js # obsolete test
-script RegExp_lastMatch.js
-script RegExp_lastMatch_as_array.js
-script RegExp_lastParen.js
-script RegExp_lastParen_as_array.js
-script RegExp_leftContext.js
-script RegExp_leftContext_as_array.js
-script RegExp_multiline.js
-script RegExp_multiline_as_array.js
-script RegExp_object.js
-script RegExp_rightContext.js
-script RegExp_rightContext_as_array.js
-script alphanumeric.js
-script asterisk.js
-script backslash.js
-script backspace.js
-script beginLine.js
-script character_class.js
-script compile.js
-script control_characters.js
-script digit.js
-script dot.js
-script endLine.js
-script everything.js
-script exec.js
-script flags.js
-script global.js
-script hexadecimal.js
-script ignoreCase.js
-script interval.js
-script octal.js
-script parentheses.js
-script plus.js
-script question_mark.js
-script regress-6359.js
-script regress-9141.js
-script simple_form.js
-script source.js
-script special_characters.js
-script string_replace.js
-script string_search.js
-skip script string_split.js # obsolete test
-script test.js
-script toString.js
-script vertical_bar.js
-script whitespace.js
-script word_boundary.js
--- a/js/src/tests/js1_2/regexp/string_split.js
+++ b/js/src/tests/js1_2/regexp/string_split.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_2/regress/jstests.list
+++ /dev/null
@@ -1,3 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_2/regress/
-script regress-144834.js
-script regress-7703.js
deleted file mode 100644
--- a/js/src/tests/js1_2/statements/jstests.list
+++ /dev/null
@@ -1,6 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_2/statements/
-script break.js
-script continue.js
-script do_while.js
-script switch.js
-script switch2.js
--- a/js/src/tests/js1_2/version120/boolean-001.js
+++ b/js/src/tests/js1_2/version120/boolean-001.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_2/version120/jstests.list
+++ /dev/null
@@ -1,3 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_2/version120/
-skip script boolean-001.js # obsolete test
-skip script regress-99663.js # obsolete test
--- a/js/src/tests/js1_2/version120/regress-99663.js
+++ b/js/src/tests/js1_2/version120/regress-99663.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_3/Boolean/jstests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_3/Boolean/
-script boolean-001.js
--- a/js/src/tests/js1_3/Script/function-001-n.js
+++ b/js/src/tests/js1_3/Script/function-001-n.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_3/Script/jstests.list
+++ /dev/null
@@ -1,7 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_3/Script/
-script delete-001.js
-skip script function-001-n.js # obsolete test
-script function-002.js
-script in-001.js
-script new-001.js
-script switch-001.js
deleted file mode 100644
--- a/js/src/tests/js1_3/extensions/jstests.list
+++ /dev/null
@@ -1,5 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_3/extensions/
-script proto_10.js
-script proto_2.js
-script proto_5.js
-script script-001.js
deleted file mode 100644
--- a/js/src/tests/js1_3/inherit/jstests.list
+++ /dev/null
@@ -1,11 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_3/inherit/
-script proto_1.js
-script proto_10.js
-script proto_11.js
-script proto_12.js
-script proto_3.js
-script proto_4.js
-script proto_6.js
-script proto_7.js
-script proto_8.js
-script proto_9.js
deleted file mode 100644
--- a/js/src/tests/js1_3/jstests.list
+++ /dev/null
@@ -1,6 +0,0 @@
-include Boolean/jstests.list
-include extensions/jstests.list
-include inherit/jstests.list
-include misc/jstests.list
-include regress/jstests.list
-include Script/jstests.list
deleted file mode 100644
--- a/js/src/tests/js1_3/regress/function-001-n.js
+++ b/js/src/tests/js1_3/regress/function-001-n.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_3/regress/jstests.list
+++ /dev/null
@@ -1,7 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_3/regress/
-script delete-001.js
-skip script function-001-n.js # obsolete test
-script function-002.js
-script in-001.js
-script new-001.js
-script switch-001.js
deleted file mode 100644
--- a/js/src/tests/js1_4/Eval/jstests.list
+++ /dev/null
@@ -1,5 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_4/Eval/
-script eval-001.js
-script eval-002.js
-script eval-003.js
-script regress-531682.js
deleted file mode 100644
--- a/js/src/tests/js1_4/Functions/jstests.list
+++ /dev/null
@@ -1,2 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_4/Functions/
-script function-001.js
deleted file mode 100644
--- a/js/src/tests/js1_4/Regress/jstests.list
+++ /dev/null
@@ -1,8 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_4/Regress/
-script date-001-n.js
-script function-001.js
-script function-002.js
-script function-003.js
-script function-004-n.js
-script regress-7224.js
-script toString-001-n.js
deleted file mode 100644
--- a/js/src/tests/js1_4/jstests.list
+++ /dev/null
@@ -1,3 +0,0 @@
-include Eval/jstests.list
-include Functions/jstests.list
-include Regress/jstests.list
deleted file mode 100644
--- a/js/src/tests/js1_5/Array/jstests.list
+++ /dev/null
@@ -1,35 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/Array/
-script 11.1.4.js
-script array-001.js
-random script regress-101964.js # bogus perf test (bug 467263)
-script regress-107138.js
-skip-if(Android) script regress-108440.js # bug - nsIDOMWindow.crypto throws NS_ERROR_NOT_IMPLEMENTED on Android
-script regress-154338.js
-skip-if(xulRuntime.XPCOMABI.match(/x86_64/)||Android) script regress-157652.js # No test results
-script regress-178722.js
-script regress-255555.js
-script regress-299644.js
-script regress-300858.js
-script regress-310351.js
-script regress-311515.js
-script regress-313153.js
-script regress-315509-01.js
-skip-if(xulRuntime.XPCOMABI.match(/x86_64/)||Android) script regress-330812.js # No test results
-script regress-345961.js
-script regress-348810.js
-script regress-350256-01.js
-script regress-350256-02.js
-script regress-360681-01.js
-script regress-360681-02.js
-script regress-364104.js
-script regress-422286.js
-script regress-424954.js
-script regress-451483.js
-script regress-451906.js
-script regress-456845.js
-script regress-465980-01.js
-skip script regress-465980-02.js # slow
-script regress-474529.js
-script regress-94257.js
-random script regress-99120-01.js # BigO
-random script regress-99120-02.js # BigO
--- a/js/src/tests/js1_5/Array/regress-101964.js
+++ b/js/src/tests/js1_5/Array/regress-101964.js
@@ -1,8 +1,9 @@
+// |reftest| random -- bogus perf test (bug 467263)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Array/regress-108440.js
+++ b/js/src/tests/js1_5/Array/regress-108440.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) -- bug - nsIDOMWindow.crypto throws NS_ERROR_NOT_IMPLEMENTED on Android
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Array/regress-157652.js
+++ b/js/src/tests/js1_5/Array/regress-157652.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(xulRuntime.XPCOMABI.match(/x86_64/)||Android) -- No test results
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Array/regress-330812.js
+++ b/js/src/tests/js1_5/Array/regress-330812.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(xulRuntime.XPCOMABI.match(/x86_64/)||Android) -- No test results
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Array/regress-465980-02.js
+++ b/js/src/tests/js1_5/Array/regress-465980-02.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Array/regress-99120-01.js
+++ b/js/src/tests/js1_5/Array/regress-99120-01.js
@@ -1,8 +1,9 @@
+// |reftest| random -- BigO
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Array/regress-99120-02.js
+++ b/js/src/tests/js1_5/Array/regress-99120-02.js
@@ -1,8 +1,9 @@
+// |reftest| random -- BigO
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_5/Date/jstests.list
+++ /dev/null
@@ -1,8 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/Date/
-script regress-188211.js
-script regress-301738-01.js
-script regress-301738-02.js
-script regress-309925-01.js
-script regress-309925-02.js
-script regress-346027.js
-script regress-346363.js
deleted file mode 100644
--- a/js/src/tests/js1_5/Error/jstests.list
+++ /dev/null
@@ -1,4 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/Error/
-script regress-354246.js
-script regress-412324.js
-script regress-465377.js
deleted file mode 100644
--- a/js/src/tests/js1_5/Exceptions/jstests.list
+++ /dev/null
@@ -1,16 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/Exceptions/
-script catchguard-002-n.js
-script catchguard-003-n.js
-script errstack-001.js
-script regress-121658.js
-script regress-123002.js
-script regress-232182.js
-script regress-257751.js
-script regress-273931.js
-script regress-315147.js
-script regress-332472.js
-script regress-333728.js
-script regress-342359.js
-script regress-347674.js
-skip-if(Android) script regress-350650-n.js
-script regress-350837.js
--- a/js/src/tests/js1_5/Exceptions/regress-350650-n.js
+++ b/js/src/tests/js1_5/Exceptions/regress-350650-n.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_5/Expressions/jstests.list
+++ /dev/null
@@ -1,6 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/Expressions/
-script regress-192288.js
-script regress-394673.js
-script regress-96526-argsub.js
-script regress-96526-delelem.js
-script regress-96526-noargsub.js
deleted file mode 100644
--- a/js/src/tests/js1_5/Function/jstests.list
+++ /dev/null
@@ -1,14 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/Function/
-script 10.1.6-01.js
-script 10.1.6.js
-script regress-123371.js
-script regress-178389.js
-script regress-222029-001.js
-script regress-222029-002.js
-script regress-292215.js
-#skip-if(Android) silentfail script regress-338001.js # disabled pending bug 657444
-#skip-if(Android) silentfail script regress-338121-01.js # disabled pending bug 657444
-#skip-if(Android) silentfail script regress-338121-02.js # disabled pending bug 657444
-#skip-if(Android) silentfail script regress-338121-03.js # disabled pending bug 657444
-script regress-344052.js
-script regress-364023.js
--- a/js/src/tests/js1_5/Function/regress-338001.js
+++ b/js/src/tests/js1_5/Function/regress-338001.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) silentfail skip -- disabled pending bug 657444
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Function/regress-338121-01.js
+++ b/js/src/tests/js1_5/Function/regress-338121-01.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) silentfail skip -- disabled pending bug 657444
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Function/regress-338121-02.js
+++ b/js/src/tests/js1_5/Function/regress-338121-02.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) silentfail skip -- disabled pending bug 657444
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Function/regress-338121-03.js
+++ b/js/src/tests/js1_5/Function/regress-338121-03.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) silentfail skip -- disabled pending bug 657444
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_5/GC/jstests.list
+++ /dev/null
@@ -1,26 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/GC/
-script regress-104584.js
-script regress-203278-2.js
-script regress-203278-3.js
-script regress-278725.js
-script regress-306788.js
-script regress-311497.js
-script regress-313276.js
-script regress-313479.js
-script regress-316885-01.js
-script regress-316885-02.js
-script regress-316885-03.js
-skip-if(!xulRuntime.shell) slow script regress-319980-01.js
-skip script regress-324278.js # slow, obsoleted by 98409 fix
-script regress-331719.js
-skip script regress-338653.js # slow, killed on x86_64
-script regress-341877-01.js
-script regress-341877-02.js
-skip script regress-346794.js # slow, killed
-skip-if(Android) script regress-348532.js
-script regress-352606.js
-skip script regress-383269-01.js # unreliable - based on GC timing
-skip script regress-383269-02.js # unreliable - based on GC timing
-script regress-390078.js
-script regress-418128.js
-skip-if(Android) script regress-440558.js
--- a/js/src/tests/js1_5/GC/regress-319980-01.js
+++ b/js/src/tests/js1_5/GC/regress-319980-01.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell) slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/GC/regress-324278.js
+++ b/js/src/tests/js1_5/GC/regress-324278.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- slow, obsoleted by 98409 fix
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/GC/regress-338653.js
+++ b/js/src/tests/js1_5/GC/regress-338653.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- slow, killed on x86_64
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/GC/regress-346794.js
+++ b/js/src/tests/js1_5/GC/regress-346794.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- slow, killed
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/GC/regress-348532.js
+++ b/js/src/tests/js1_5/GC/regress-348532.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/GC/regress-383269-01.js
+++ b/js/src/tests/js1_5/GC/regress-383269-01.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- unreliable - based on GC timing
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/GC/regress-383269-02.js
+++ b/js/src/tests/js1_5/GC/regress-383269-02.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- unreliable - based on GC timing
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/GC/regress-440558.js
+++ b/js/src/tests/js1_5/GC/regress-440558.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_5/GetSet/jstests.list
+++ /dev/null
@@ -1,4 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/GetSet/
-script getset-002.js
-skip script regress-353264.js # obsolete test
-script regress-375976.js
--- a/js/src/tests/js1_5/GetSet/regress-353264.js
+++ b/js/src/tests/js1_5/GetSet/regress-353264.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_5/LexicalConventions/jstests.list
+++ /dev/null
@@ -1,6 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/LexicalConventions/
-script let.js
-script lexical-001.js
-script regress-177314.js
-script regress-343675.js
-script regress-469940.js
deleted file mode 100644
--- a/js/src/tests/js1_5/Object/jstests.list
+++ /dev/null
@@ -1,11 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/Object/
-script regress-137000.js
-script regress-192105.js
-script regress-308806-01.js
-script regress-338709.js
-script regress-362872-01.js
-script regress-362872-02.js
-script regress-382503.js
-script regress-382532.js
-script regress-465476.js
-script regress-90596-003.js
deleted file mode 100644
--- a/js/src/tests/js1_5/Regress/jstests.list
+++ /dev/null
@@ -1,369 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/Regress/
-script regress-102725.js
-script regress-10278.js
-script regress-103602.js
-script regress-104077.js
-skip script regress-106244.js # obsolete test
-script regress-110286.js
-script regress-111557.js
-script regress-114491.js
-script regress-114493.js
-script regress-115436.js
-script regress-116228.js
-script regress-118849.js
-skip script regress-119719.js # obsolete test
-skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow script regress-127243.js
-script regress-127557.js
-script regress-131510-001.js
-script regress-139316.js
-script regress-140852.js
-script regress-140974.js
-script regress-146596.js
-script regress-152646.js
-script regress-155081-2.js
-script regress-155081.js
-script regress-156354.js
-script regress-159334.js
-script regress-162392.js
-script regress-165201.js
-script regress-167328.js
-script regress-167658.js
-script regress-168347.js
-random script regress-169559.js
-script regress-170193.js
-script regress-172699.js
-skip script regress-173067.js # obsolete test
-script regress-174709.js
-script regress-176125.js
-script regress-179524.js
-script regress-185165.js
-script regress-191633.js
-script regress-191668.js
-script regress-192414.js
-script regress-193418.js
-script regress-203278-1.js
-script regress-203402.js
-script regress-203841.js
-script regress-204210.js
-script regress-210682.js
-script regress-211590.js
-script regress-213482.js
-script regress-214761.js
-script regress-216320.js
-script regress-224956.js
-script regress-229006.js
-script regress-230216-1.js
-script regress-230216-2.js
-script regress-230216-3.js
-script regress-233483-2.js
-script regress-233483.js
-script regress-234389.js
-script regress-238881.js
-script regress-238945.js
-script regress-240577.js
-script regress-243174.js
-script regress-243389-n.js
-script regress-243869.js
-script regress-244470.js
-script regress-244619.js
-script regress-245113.js
-script regress-245308.js
-script regress-246911.js
-script regress-246964.js
-script regress-247179.js
-script regress-248444.js
-skip script regress-249211.js # obsolete test
-script regress-252892.js
-script regress-253150.js
-script regress-254296.js
-script regress-254974.js
-script regress-256501.js
-script regress-256617.js
-script regress-256798.js
-skip-if(xulRuntime.shell) script regress-259935.js # browser only
-script regress-260541.js
-script regress-261886.js
-skip script regress-261887.js # we violate the spec here with our new iterators
-skip script regress-271716-n.js # never terminates
-script regress-274035.js
-script regress-274888.js
-script regress-275378.js
-script regress-276103.js
-script regress-278873.js
-script regress-280769-1.js
-skip-if(Android) silentfail script regress-280769-2.js
-script regress-280769-3.js
-script regress-280769-4.js
-script regress-280769-5.js
-script regress-280769.js
-script regress-281606.js
-script regress-281930.js
-script regress-283477.js
-script regress-288688.js
-script regress-289094.js
-script regress-290575.js
-script regress-290656.js
-script regress-294191.js
-script regress-294195-01.js
-script regress-294195-02.js
-script regress-294302.js
-script regress-295052.js
-script regress-295666.js
-script regress-299209.js
-script regress-299641.js
-skip-if(!xulRuntime.shell||Android) script regress-303213.js # bug 524731
-script regress-306633.js
-script regress-306727.js
-script regress-306794.js
-script regress-308085.js
-script regress-308566.js
-script regress-309242.js
-script regress-310295.js
-script regress-310607.js
-script regress-310993.js
-script regress-311071.js
-script regress-311629.js
-script regress-312260.js
-script regress-31255.js
-skip-if(Android) script regress-312588.js
-random script regress-313967-01.js # BigO
-random script regress-313967-02.js # BigO
-skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow script regress-314401.js
-script regress-315974.js
-script regress-315990.js
-script regress-317476.js
-script regress-317533.js
-script regress-317714-01.js
-script regress-317714-02.js
-script regress-319384.js
-script regress-319391.js
-script regress-320032.js
-skip script regress-320119.js # obsolete test
-script regress-321757.js
-script regress-321874.js
-script regress-321971.js
-script regress-322430.js
-script regress-323314-1.js
-script regress-325925.js
-script regress-326453.js
-script regress-326467.js
-script regress-328012.js
-script regress-328664.js
-fails-if(browserIsRemote) script regress-328897.js
-script regress-329383.js
-skip-if(Android) script regress-329530.js
-skip-if(Android) script regress-330352.js
-script regress-330951.js
-script regress-334807-01.js
-script regress-334807-02.js
-script regress-334807-03.js
-script regress-334807-04.js
-script regress-334807-05.js
-script regress-334807-06.js
-script regress-336100.js
-script regress-338307.js
-script regress-340369.js
-skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow script regress-341360.js
-script regress-343713.js
-script regress-343966.js
-script regress-344711-n.js
-script regress-344804.js
-script regress-344959.js
-script regress-346237.js
-script regress-346801.js
-random script regress-347306-01.js # BigO
-script regress-349482-01.js
-script regress-349482-02.js
-script regress-349592.js
-script regress-349648.js
-script regress-350253.js
-script regress-350268.js
-script regress-350312.js
-script regress-350415.js
-script regress-350529.js
-skip script regress-350692.js # obsolete test
-skip-if(xulRuntime.OS=="Linux"&&!xulRuntime.shell&&!xulRuntime.XPCOMABI.match(/x86_64/)&&isDebugBuild) script regress-351116.js # bug 521549
-script regress-351515.js
-script regress-352009.js
-script regress-352197.js
-script regress-352208.js
-script regress-352604.js
-skip script regress-354924.js # obsolete test
-script regress-355341.js
-script regress-355344.js
-script regress-355556.js
-script regress-355829-01.js
-script regress-355829-02.js
-script regress-355829-03.js
-script regress-356250.js
-script regress-356693.js
-script regress-360969-01.js
-script regress-360969-02.js
-script regress-360969-03.js
-script regress-360969-04.js
-script regress-360969-05.js
-script regress-360969-06.js
-script regress-361467.js
-script regress-361617.js
-skip script regress-362583.js # obsolete test
-skip script regress-3649-n.js # skip test due to random oom related errors.
-script regress-366122.js
-script regress-366468.js
-script regress-366601.js
-script regress-367561-01.js
-script regress-367561-03.js
-script regress-372364.js
-script regress-379245.js
-script regress-383674.js
-script regress-383682.js
-script regress-385393-06.js
-script regress-387951-01.js
-script regress-387951-02.js
-script regress-387951-03.js
-script regress-39309.js
-script regress-396684.js
-script regress-398085-01.js
-script regress-398085-02.js
-script regress-398609.js
-skip script regress-404755.js # unreliable - based on GC timing
-script regress-406769.js
-script regress-407024.js
-script regress-407323.js
-script regress-407957.js
-script regress-410852.js
-random script regress-416628.js # BigO
-script regress-416737-01.js
-script regress-416737-02.js
-script regress-417893.js
-script regress-418504.js
-skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow script regress-418540.js
-script regress-419018.js
-script regress-419803.js
-script regress-420919.js
-skip-if(xulRuntime.XPCOMABI.match(/x86_64/)) script regress-422348.js # On 64-bit, takes forever rather than throwing
-script regress-424311.js
-skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow script regress-425360.js
-script regress-426827.js
-script regress-428366.js
-script regress-438415-01.js
-script regress-438415-02.js
-script regress-440926.js
-script regress-449627.js
-script regress-449666.js
-script regress-450369.js
-script regress-450833.js
-skip script regress-451322.js # slow
-script regress-451884.js
-script regress-451946.js
-script regress-452008.js
-script regress-452170.js
-script regress-452189.js
-script regress-452333.js
-script regress-452336.js
-script regress-452346.js
-script regress-452495.js
-script regress-452573-01.js
-script regress-452573-02.js
-script regress-452713.js
-script regress-452724-01.js
-script regress-452724-02.js
-script regress-452742-01.js
-script regress-452742-02.js
-script regress-452853.js
-script regress-452884-01.js
-script regress-452884-02.js
-script regress-453024.js
-script regress-453173.js
-script regress-453397.js
-script regress-453701.js
-script regress-453747.js
-script regress-454682.js
-script regress-454981.js
-script regress-455605.js
-script regress-455748.js
-script regress-455758-01.js
-script regress-455758-02.js
-script regress-455775.js
-script regress-456470.js
-script regress-456477-01.js
-script regress-456477-02.js
-script regress-456494.js
-script regress-456540-01.js
-script regress-456540-02.js
-script regress-457065-03.js
-script regress-457456.js
-script regress-457778.js
-script regress-458851.js
-script regress-459085.js
-script regress-459628.js
-script regress-459990.js
-script regress-460024.js
-script regress-460117.js
-script regress-460886-01.js
-script regress-460886-02.js
-script regress-461307.js
-script regress-461723.js
-script regress-462292.js
-script regress-462879.js
-script regress-462989.js
-script regress-463259.js
-script regress-463782.js
-script regress-464334.js
-script regress-464862.js
-script regress-465013.js
-script regress-465132.js
-script regress-465133.js
-script regress-465135.js
-script regress-465136.js
-script regress-465137.js
-script regress-465262.js
-script regress-465272.js
-script regress-465347.js
-script regress-465366.js
-script regress-466262.js
-script regress-466747.js
-script regress-469044.js
-script regress-470061.js
-script regress-470187-01.js
-script regress-470187-02.js
-script regress-470758-01.js
-script regress-470758-02.js
-script regress-472533.js
-script regress-475645-01.js
-script regress-475645-02.js
-script regress-476049.js
-script regress-476192.js
-script regress-477733.js
-script regress-477758.js
-script regress-478314.js
-script regress-479353.js
-script regress-480147.js
-script regress-480244.js
-script regress-481436.js
-script regress-482421.js
-script regress-482783.js
-script regress-483103.js
-script regress-501124.js
-script regress-503860.js
-script regress-504078.js
-script regress-506567.js
-script regress-511859.js
-script regress-57043.js
-script regress-58116.js
-script regress-68498-001.js
-script regress-68498-002.js
-script regress-68498-003.js
-script regress-68498-004.js
-script regress-69607.js
-script regress-71107.js
-script regress-76054.js
-slow script regress-80981.js
-script regress-82306.js
-script regress-89443.js
-script regress-89474.js
-script regress-90445.js
-script regress-96128-n.js
-script regress-96526-001.js
-script regress-96526-002.js
-script regress-96526-003.js
-script regress-98901.js
--- a/js/src/tests/js1_5/Regress/regress-106244.js
+++ b/js/src/tests/js1_5/Regress/regress-106244.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-119719.js
+++ b/js/src/tests/js1_5/Regress/regress-119719.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-127243.js
+++ b/js/src/tests/js1_5/Regress/regress-127243.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-169559.js
+++ b/js/src/tests/js1_5/Regress/regress-169559.js
@@ -1,8 +1,9 @@
+// |reftest| random
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /*
  * Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/licenses/publicdomain/
  * Contributor: Bob Clary
  */
 
 //-----------------------------------------------------------------------------
--- a/js/src/tests/js1_5/Regress/regress-173067.js
+++ b/js/src/tests/js1_5/Regress/regress-173067.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-249211.js
+++ b/js/src/tests/js1_5/Regress/regress-249211.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-259935.js
+++ b/js/src/tests/js1_5/Regress/regress-259935.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(xulRuntime.shell) -- browser only
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-261887.js
+++ b/js/src/tests/js1_5/Regress/regress-261887.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- we violate the spec here with our new iterators
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-271716-n.js
+++ b/js/src/tests/js1_5/Regress/regress-271716-n.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- never terminates
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-280769-2.js
+++ b/js/src/tests/js1_5/Regress/regress-280769-2.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android) silentfail
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-303213.js
+++ b/js/src/tests/js1_5/Regress/regress-303213.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(!xulRuntime.shell||Android) -- bug 524731
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-312588.js
+++ b/js/src/tests/js1_5/Regress/regress-312588.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-313967-01.js
+++ b/js/src/tests/js1_5/Regress/regress-313967-01.js
@@ -1,8 +1,9 @@
+// |reftest| random -- BigO
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-313967-02.js
+++ b/js/src/tests/js1_5/Regress/regress-313967-02.js
@@ -1,8 +1,9 @@
+// |reftest| random -- BigO
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-314401.js
+++ b/js/src/tests/js1_5/Regress/regress-314401.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-320119.js
+++ b/js/src/tests/js1_5/Regress/regress-320119.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-328897.js
+++ b/js/src/tests/js1_5/Regress/regress-328897.js
@@ -1,8 +1,9 @@
+// |reftest| fails-if(browserIsRemote)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-329530.js
+++ b/js/src/tests/js1_5/Regress/regress-329530.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-330352.js
+++ b/js/src/tests/js1_5/Regress/regress-330352.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(Android)
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-341360.js
+++ b/js/src/tests/js1_5/Regress/regress-341360.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-347306-01.js
+++ b/js/src/tests/js1_5/Regress/regress-347306-01.js
@@ -1,8 +1,9 @@
+// |reftest| random -- BigO
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-350692.js
+++ b/js/src/tests/js1_5/Regress/regress-350692.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-351116.js
+++ b/js/src/tests/js1_5/Regress/regress-351116.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(xulRuntime.OS=="Linux"&&!xulRuntime.shell&&!xulRuntime.XPCOMABI.match(/x86_64/)&&isDebugBuild) -- bug 521549
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-354924.js
+++ b/js/src/tests/js1_5/Regress/regress-354924.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-362583.js
+++ b/js/src/tests/js1_5/Regress/regress-362583.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-3649-n.js
+++ b/js/src/tests/js1_5/Regress/regress-3649-n.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- skip test due to random oom related errors.
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-404755.js
+++ b/js/src/tests/js1_5/Regress/regress-404755.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- unreliable - based on GC timing
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-416628.js
+++ b/js/src/tests/js1_5/Regress/regress-416628.js
@@ -1,8 +1,9 @@
+// |reftest| random -- BigO
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-418540.js
+++ b/js/src/tests/js1_5/Regress/regress-418540.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-422348.js
+++ b/js/src/tests/js1_5/Regress/regress-422348.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(xulRuntime.XPCOMABI.match(/x86_64/)) -- On 64-bit, takes forever rather than throwing
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-425360.js
+++ b/js/src/tests/js1_5/Regress/regress-425360.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(xulRuntime.OS=="WINNT"&&isDebugBuild) slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-451322.js
+++ b/js/src/tests/js1_5/Regress/regress-451322.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/Regress/regress-80981.js
+++ b/js/src/tests/js1_5/Regress/regress-80981.js
@@ -1,8 +1,9 @@
+// |reftest| slow
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_5/Scope/jstests.list
+++ /dev/null
@@ -1,18 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/Scope/
-script regress-154693.js
-script regress-181834.js
-script regress-184107.js
-script regress-185485.js
-script regress-191276.js
-script regress-192226.js
-script regress-202678-001.js
-script regress-202678-002.js
-script regress-208496-001.js
-script regress-208496-002.js
-script regress-220362.js
-script regress-446026-01.js
-script regress-446026-02.js
-script regress-77578-001.js
-script scope-002.js
-script scope-003.js
-script scope-004.js
deleted file mode 100644
--- a/js/src/tests/js1_5/String/jstests.list
+++ /dev/null
@@ -1,9 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/String/
-script regress-107771.js
-script regress-112626.js
-random script regress-157334-01.js # BigO
-script regress-179068.js
-random script regress-314890.js # BigO
-random script regress-322772.js # BigO
-random skip-if(xulRuntime.OS=="Linux"&&!isDebugBuild&&!xulRuntime.XPCOMABI.match(/x86_64/)) script regress-56940-01.js # BigO, slow if Linux 32bit opt
-random script regress-56940-02.js # BigO
--- a/js/src/tests/js1_5/String/regress-157334-01.js
+++ b/js/src/tests/js1_5/String/regress-157334-01.js
@@ -1,8 +1,9 @@
+// |reftest| random -- BigO
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/String/regress-314890.js
+++ b/js/src/tests/js1_5/String/regress-314890.js
@@ -1,8 +1,9 @@
+// |reftest| random -- BigO
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/String/regress-322772.js
+++ b/js/src/tests/js1_5/String/regress-322772.js
@@ -1,8 +1,9 @@
+// |reftest| random -- BigO
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/String/regress-56940-01.js
+++ b/js/src/tests/js1_5/String/regress-56940-01.js
@@ -1,8 +1,9 @@
+// |reftest| skip-if(xulRuntime.OS=="Linux"&&!isDebugBuild&&!xulRuntime.XPCOMABI.match(/x86_64/)) random -- BigO, slow if Linux 32bit opt
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/String/regress-56940-02.js
+++ b/js/src/tests/js1_5/String/regress-56940-02.js
@@ -1,8 +1,9 @@
+// |reftest| random -- BigO
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_5/decompilation/jstests.list
+++ /dev/null
@@ -1,63 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/decompilation/
-script regress-344120.js
-script regress-346892.js
-script regress-346902.js
-script regress-346904.js
-script regress-346915.js
-skip script regress-349484.js # obsolete test
-script regress-349489.js
-script regress-349491.js
-script regress-349596.js
-script regress-349650.js
-script regress-349663.js
-script regress-350242.js
-script regress-350263.js
-script regress-350271.js
-script regress-350666.js
-script regress-350670.js
-script regress-351104.js
-script regress-351219.js
-skip script regress-351336.js # obsolete test
-script regress-351597.js
-script regress-351625.js
-skip script regress-351626.js # obsolete test
-script regress-351693.js
-script regress-351705.js
-script regress-351793.js
-script regress-352013.js
-script regress-352022.js
-script regress-352073.js
-script regress-352202.js
-script regress-352312.js
-script regress-352360.js
-script regress-352375.js
-script regress-352453.js
-script regress-352649.js
-script regress-352873-01.js
-script regress-352873-02.js
-script regress-353000.js
-script regress-353120.js
-script regress-353146.js
-skip script regress-354878.js # obsolete test
-script regress-354910.js
-script regress-356083.js
-script regress-371692.js
-skip script regress-373678.js # obsolete test
-script regress-375639.js
-script regress-375882.js
-script regress-376564.js
-script regress-383721.js
-script regress-406555.js
-skip script regress-437288-02.js # obsolete test
-script regress-443071-01.js
-script regress-456964-01.js
-script regress-457093-01.js
-script regress-457824.js
-script regress-460116-01.js
-script regress-460116-02.js
-script regress-460116-03.js
-script regress-460501.js
-script regress-460870.js
-script regress-461108.js
-script regress-461110.js
-script regress-461111.js
--- a/js/src/tests/js1_5/decompilation/regress-349484.js
+++ b/js/src/tests/js1_5/decompilation/regress-349484.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/decompilation/regress-351336.js
+++ b/js/src/tests/js1_5/decompilation/regress-351336.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/decompilation/regress-351626.js
+++ b/js/src/tests/js1_5/decompilation/regress-351626.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/decompilation/regress-354878.js
+++ b/js/src/tests/js1_5/decompilation/regress-354878.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/decompilation/regress-373678.js
+++ b/js/src/tests/js1_5/decompilation/regress-373678.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
--- a/js/src/tests/js1_5/decompilation/regress-437288-02.js
+++ b/js/src/tests/js1_5/decompilation/regress-437288-02.js
@@ -1,8 +1,9 @@
+// |reftest| skip -- obsolete test
 /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
 /* ***** BEGIN LICENSE BLOCK *****
  * Version: MPL 1.1/GPL 2.0/LGPL 2.1
  *
  * The contents of this file are subject to the Mozilla Public License Version
  * 1.1 (the "License"); you may not use this file except in compliance with
  * the License. You may obtain a copy of the License at
  * http://www.mozilla.org/MPL/
deleted file mode 100644
--- a/js/src/tests/js1_5/extensions/jstests.list
+++ /dev/null
@@ -1,221 +0,0 @@
-url-prefix ../../jsreftest.html?test=js1_5/extensions/
-script catchguard-001-n.js
-script catchguard-001.js
-script catchguard-002.js
-script catchguard-003.js
-script getset-001.js
-script getset-003.js
-script getset-004.js
-script getset-005.js
-script getset-006.js
-script no-such-method.js
-script regress-104077.js
-script regress-164697.js
-script regress-178722.js
-script regress-192465.js
-script regress-225831.js
-script regress-226078.js
-script regress-226507.js
-script regress-231518.js
-script regress-237461.js
-script regress-245148.js
-script regress-245795.js
-script regress-254375.js
-script regress-255245.js
-script regress-291213.js
-script regress-300079.js
-script regress-303277.js
-script regress-304897.js
-script regress-306738.js
-script regress-311161.js
-script regress-311583.js
-script regress-311792-01.js
-script regress-311792-02.js
-script regress-313763.js
-script regress-313803.js
-script regress-313938.js
-script regress-314874.js
-script regress-315509-02.js
-script regress-319683.js
-script regress-322957.js
-script regress-327608.js
-script regress-328443.js
-script regress-328556.js
-skip script regress-330569.js # Yarr doesn't bail on complex regexps.
-script regress-333541.js
-skip script regress-335700.js # bug xxx - reftest hang, BigO
-skip-if(!xulRuntime.shell||Android) slow script regress-336409-1.js # no results reported.
-skip-if(!xulRuntime.shell&&((Android||(isDebugBuild&&xulRuntime.OS=="Linux")||xulRuntime.XPCOMABI.match(/x86_64/)))) silentfail slow script regress-336409-2.js # can fail silently due to out of memory, bug 615011 - timeouts on slow debug Linux
-skip-if(!xulRuntime.shell||Android) silentfail slow script regress-336410-1.js # can fail silently due to out of memory
-skip-if(!xulRuntime.shell&&((isDebugBuild&&xulRuntime.OS=="Linux")||Android||xulRuntime.XPCOMABI.match(/x86_64/)||xulRuntime.OS=="WINNT")) silentfail slow script regress-336410-2.js # can fail silently due to out of memory, bug 621348 - timeouts on slow debug Linux
-script regress-338804-01.js
-script regress-338804-02.js
-script regress-338804-03.js
-script regress-339685.js
-script regress-341956-01.js
-script regress-341956-02.js
-script regress-341956-03.js
-skip-if(!xulRuntime.shell&&(Android||xulRuntime.OS=="WINNT"||xulRuntime.OS=="Linux")) silentfail slow script regress-342960.js # bug 528464
-skip script regress-345967.js # slow
-script regress-346494-01.js
-script regress-346494.js
-random script regress-347306-02.js # BigO
-script regress-348986.js
-script regress-350312-01.js
-script regress-350312-02.js
-script regress-350312-03.js
-skip script regress-350531.js # slow
-script regress-351102-01.js
-script regress-351102-02.js
-script regress-351102-06.js
-skip script regress-351448.js # Yarr doesn't have the same complexity errors at execution time.
-script regress-351463-01.js
-script regress-351973.js
-script regress-352261.js
-skip script regress-352281.js # obsolete test
-script regress-352291.js
-script regress-352372.js
-script regress-352604.js
-script regress-353214.js
-script regress-354297.js
-script regress-354541-01.js
-script regress-354541-02.js
-script regress-354541-03.js
-script regress-354541-04.js
-script regress-355339.js
-script regress-355497.js
-skip script regress-355622.js # obsolete test
-script regress-355655.js
-script regress-355736.js
-script regress-355820.js
-script regress-355982.js
-script regress-356402.js
-script regress-358594-01.js
-script regress-358594-02.js
-script regress-358594-03.js
-script regress-358594-04.js
-script regress-358594-05.js
-script regress-358594-06.js
-script regress-359024.js
-script regress-361346.js
-script regress-361360.js
-script regress-361552.js
-script regress-361558.js
-script regress-361571.js
-script regress-361856.js
-skip script regress-361964.js # slow, alert not dismissed, now busted by harness
-random script regress-363258.js # bug 524788
-script regress-363988.js
-slow script regress-365527.js
-script regress-365692.js
-script regress-365869.js
-script regress-366288.js
-script regress-366292.js
-script regress-366396.js
-script regress-367118-01.js
-script regress-367118-02.js
-script regress-367119-01.js
-script re