tyler.durden/test262
1
0
Fork 0
mirror of https://github.com/tc39/test262.git synced 2025-07-26 07:25:15 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #338 from bocoup/move-web-scripts

Browse Source 
Move web scripts
This commit is contained in:
Brian Terlson 2015-06-26 10:58:59 -07:00
commit 9abed155e3
12 changed files with 20 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tools/packaging/templates/runner.bestPractice.html
View File

@ -2,18 +2,18 @@
<html dir="ltr" xmlns="http://www.w3.org/1999/xhtml"> <html dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" /> <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
<script type="text/javascript" src="harness/jquery-1.4.2.min.js"></script> <script type="text/javascript" src="scripts/lib/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="harness/sections.js"></script> <script type="text/javascript" src="scripts/sections.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//Globals //Globals
var STANDARD = "ECMA-262"; var STANDARD = "ECMA-262";
var TEST_LIST_PATH = "json/testcaseslist.json"; var TEST_LIST_PATH = "json/testcaseslist.json";
</script> </script>
<script type="text/javascript" src="harness/sth.js"></script> <script type="text/javascript" src="scripts/sth.js"></script>
<script type="text/javascript" src="harness/sta.js"></script> <script type="text/javascript" src="harness/sta.js"></script>
<script type="text/javascript" src="harness/jqueryprogressbar.js"></script> <script type="text/javascript" src="scripts/lib/jqueryprogressbar.js"></script>
<script type="text/javascript" src="harness/helper.js"></script> <script type="text/javascript" src="scripts/helper.js"></script>
<script type="text/javascript" src="harness/jquery.base64.js"></script> <script type="text/javascript" src="scripts/lib/jquery.base64.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//To support all the browsers //To support all the browsers
$(window).resize(ResizeLoadIndicator); $(window).resize(ResizeLoadIndicator);

12
tools/packaging/templates/runner.intl402.html
View File

@ -2,18 +2,18 @@
<html dir="ltr" xmlns="http://www.w3.org/1999/xhtml"> <html dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" /> <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
<script type="text/javascript" src="harness/jquery-1.4.2.min.js"></script> <script type="text/javascript" src="scripts/lib/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="harness/sections.js"></script> <script type="text/javascript" src="scripts/sections.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//Globals //Globals
var STANDARD = "ECMA-402"; var STANDARD = "ECMA-402";
var TEST_LIST_PATH = "json/testcaseslist.json"; var TEST_LIST_PATH = "json/testcaseslist.json";
</script> </script>
<script type="text/javascript" src="harness/sth.js"></script> <script type="text/javascript" src="scripts/sth.js"></script>
<script type="text/javascript" src="harness/sta.js"></script> <script type="text/javascript" src="harness/sta.js"></script>
<script type="text/javascript" src="harness/jqueryprogressbar.js"></script> <script type="text/javascript" src="scripts/lib/jqueryprogressbar.js"></script>
<script type="text/javascript" src="harness/helper.js"></script> <script type="text/javascript" src="scripts/helper.js"></script>
<script type="text/javascript" src="harness/jquery.base64.js"></script> <script type="text/javascript" src="scripts/lib/jquery.base64.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//To support all the browsers //To support all the browsers
$(window).resize(ResizeLoadIndicator); $(window).resize(ResizeLoadIndicator);

12
tools/packaging/templates/runner.test262.html
View File

@ -2,18 +2,18 @@
<html dir="ltr" xmlns="http://www.w3.org/1999/xhtml"> <html dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
<head> <head>
<meta content="text/html; charset=utf-8" http-equiv="Content-Type" /> <meta content="text/html; charset=utf-8" http-equiv="Content-Type" />
<script type="text/javascript" src="harness/jquery-1.4.2.min.js"></script> <script type="text/javascript" src="scripts/lib/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="harness/sections.js"></script> <script type="text/javascript" src="scripts/sections.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//Globals //Globals
var STANDARD = "ECMA-262"; var STANDARD = "ECMA-262";
var TEST_LIST_PATH = "json/testcaseslist.json"; var TEST_LIST_PATH = "json/testcaseslist.json";
</script> </script>
<script type="text/javascript" src="harness/sth.js"></script> <script type="text/javascript" src="scripts/sth.js"></script>
<script type="text/javascript" src="harness/sta.js"></script> <script type="text/javascript" src="harness/sta.js"></script>
<script type="text/javascript" src="harness/jqueryprogressbar.js"></script> <script type="text/javascript" src="scripts/lib/jqueryprogressbar.js"></script>
<script type="text/javascript" src="harness/helper.js"></script> <script type="text/javascript" src="scripts/helper.js"></script>
<script type="text/javascript" src="harness/jquery.base64.js"></script> <script type="text/javascript" src="scripts/lib/jquery.base64.js"></script>
<script type="text/javascript"> <script type="text/javascript">
//To support all the browsers //To support all the browsers
$(window).resize(ResizeLoadIndicator); $(window).resize(ResizeLoadIndicator);

2
tools/packaging/test262.py
View File

@ -277,7 +277,7 @@ class TestCase(object):
def GetIncludeList(self): def GetIncludeList(self):
if self.testRecord.get('includes'): if self.testRecord.get('includes'):
return self.testRecord['includes'] return self.testRecord['includes']
return re.findall('\$INCLUDE\([\'"]([^\)]+)[\'"]\)', self.test) return []
def GetAdditionalIncludes(self): def GetAdditionalIncludes(self):
return '\n'.join([self.suite.GetInclude(include) for include in self.GetIncludeList()]) return '\n'.join([self.suite.GetInclude(include) for include in self.GetIncludeList()])

0
harness/ed.js → website/scripts/ed.js
View File

0
harness/gs.js → website/scripts/gs.js
View File

0
harness/helper.js → website/scripts/helper.js
View File

0
harness/jquery-1.4.2.min.js → website/scripts/lib/jquery-1.4.2.min.js vendored
View File

0
harness/jquery.base64.js → website/scripts/lib/jquery.base64.js
View File

0
harness/jqueryprogressbar.js → website/scripts/lib/jqueryprogressbar.js vendored
View File

0
harness/sections.js → website/scripts/sections.js
View File

7
harness/sth.js → website/scripts/sth.js
View File

@ -173,12 +173,7 @@ function BrowserRunner() {
include; include;
includes = test.includes; includes = test.includes;
if (!includes || !(includes.length)) { if (includes && includes.length) {
// includes not specified via frontmatter; find all of the $INCLUDE statements
includes = code.match(/\$INCLUDE\(([^\)]+)\)/g);
}
if (includes !== null) {
// We have some includes, so loop through each include and // We have some includes, so loop through each include and
// pull in the dependencies. // pull in the dependencies.
for (var i = 0; i < includes.length; i++) { for (var i = 0; i < includes.length; i++) {