diff options
| author | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
|---|---|---|
| committer | Alexander Sulfrian <alexander@sulfrian.net> | 2010-06-08 09:01:43 +0200 |
| commit | d1fa08fdc9cb11dccee76d668ff85df30458c295 (patch) | |
| tree | 1d19df6405103577d872902486792e8c23bce711 /trunk/infrastructure/rhino1_7R1/testsrc/opt1.skip | |
| parent | d7c5ad7d6263fd1baf9bfdbaa4c50b70ef2fbdb2 (diff) | |
| parent | 70d1f9d6fcaefe611e778b8dbf3bafea8934aa08 (diff) | |
| download | etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.gz etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.tar.bz2 etherpad-d1fa08fdc9cb11dccee76d668ff85df30458c295.zip | |
Merge remote branch 'upstream/master'
Conflicts:
etherpad/src/etherpad/control/pro/admin/pro_admin_control.js
etherpad/src/etherpad/control/pro/pro_main_control.js
etherpad/src/etherpad/control/pro_help_control.js
etherpad/src/etherpad/globals.js
etherpad/src/etherpad/legacy_urls.js
etherpad/src/etherpad/pne/pne_utils.js
etherpad/src/etherpad/pro/pro_utils.js
etherpad/src/main.js
etherpad/src/plugins/fileUpload/templates/fileUpload.ejs
etherpad/src/plugins/testplugin/templates/page.ejs
etherpad/src/static/css/pad2_ejs.css
etherpad/src/static/css/pro-help.css
etherpad/src/static/img/jun09/pad/protop.gif
etherpad/src/static/js/store.js
etherpad/src/themes/default/templates/framed/framedheader-pro.ejs
etherpad/src/themes/default/templates/main/home.ejs
etherpad/src/themes/default/templates/pro-help/main.ejs
etherpad/src/themes/default/templates/pro-help/pro-help-template.ejs
infrastructure/com.etherpad/licensing.scala
trunk/etherpad/src/etherpad/collab/ace/contentcollector.js
trunk/etherpad/src/etherpad/collab/ace/linestylefilter.js
trunk/etherpad/src/static/css/home-opensource.css
trunk/etherpad/src/static/js/ace.js
trunk/etherpad/src/static/js/linestylefilter_client.js
trunk/etherpad/src/templates/email/eepnet_license_info.ejs
trunk/etherpad/src/templates/pad/pad_body2.ejs
trunk/etherpad/src/templates/pad/pad_content.ejs
trunk/etherpad/src/templates/pad/padfull_body.ejs
trunk/etherpad/src/templates/pro/admin/pne-license-manager.ejs
Diffstat (limited to 'trunk/infrastructure/rhino1_7R1/testsrc/opt1.skip')
| -rw-r--r-- | trunk/infrastructure/rhino1_7R1/testsrc/opt1.skip | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/trunk/infrastructure/rhino1_7R1/testsrc/opt1.skip b/trunk/infrastructure/rhino1_7R1/testsrc/opt1.skip deleted file mode 100644 index 7006882..0000000 --- a/trunk/infrastructure/rhino1_7R1/testsrc/opt1.skip +++ /dev/null @@ -1,26 +0,0 @@ -# Rhino skip list: opt1.skip. Tests to be run at -opt 1 -# These tests are skipped by Rhino either because a bug with a regression -# test has yet to be fixed, or because the test is not applicable to Rhino. - -# program too large/complex -ecma_3/Statements/regress-302439.js -ecma_3/Statements/regress-324650.js -ecma_3/Statements/regress-74474-002.js -ecma_3/Statements/regress-74474-003.js -js1_5/Regress/regress-244470.js -js1_5/Regress/regress-308085.js -js1_5/Regress/regress-80981.js -js1_5/Regress/regress-89443.js -js1_5/extensions/regress-226507.js - -# program too large/complex; could have better error message -js1_5/Regress/regress-111557.js -js1_5/Regress/regress-155081-2.js -js1_5/Regress/regress-155081.js -js1_5/extensions/regress-311161.js - -# Missing line number information on error -js1_5/Regress/regress-167328.js -js1_5/extensions/regress-50447.js -js1_5/Exceptions/regress-257751.js - |