diff --git a/tools/packaging/templates/runner.bestPractice.html b/tools/packaging/templates/runner.bestPractice.html
index 60c3bbef6f66115c1a1cb8759352721f0082169f..f2f0f8638e950db11a66d3d7b697b69eb9ee9c85 100644
--- a/tools/packaging/templates/runner.bestPractice.html
+++ b/tools/packaging/templates/runner.bestPractice.html
@@ -2,18 +2,18 @@
<html dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
<head>
<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="harness/sections.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="scripts/sections.js"></script>
<script type="text/javascript">
//Globals
var STANDARD = "ECMA-262";
var TEST_LIST_PATH = "json/testcaseslist.json";
</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/jqueryprogressbar.js"></script>
-<script type="text/javascript" src="harness/helper.js"></script>
-<script type="text/javascript" src="harness/jquery.base64.js"></script>
+<script type="text/javascript" src="scripts/lib/jqueryprogressbar.js"></script>
+<script type="text/javascript" src="scripts/helper.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.base64.js"></script>
<script type="text/javascript">
//To support all the browsers
$(window).resize(ResizeLoadIndicator);
diff --git a/tools/packaging/templates/runner.intl402.html b/tools/packaging/templates/runner.intl402.html
index 11f8321f062362bca625af9891303621481692ed..3f479225b788faf30f48423e94f515630f9a42ed 100644
--- a/tools/packaging/templates/runner.intl402.html
+++ b/tools/packaging/templates/runner.intl402.html
@@ -2,18 +2,18 @@
<html dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
<head>
<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="harness/sections.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="scripts/sections.js"></script>
<script type="text/javascript">
//Globals
var STANDARD = "ECMA-402";
var TEST_LIST_PATH = "json/testcaseslist.json";
</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/jqueryprogressbar.js"></script>
-<script type="text/javascript" src="harness/helper.js"></script>
-<script type="text/javascript" src="harness/jquery.base64.js"></script>
+<script type="text/javascript" src="scripts/lib/jqueryprogressbar.js"></script>
+<script type="text/javascript" src="scripts/helper.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.base64.js"></script>
<script type="text/javascript">
//To support all the browsers
$(window).resize(ResizeLoadIndicator);
diff --git a/tools/packaging/templates/runner.test262.html b/tools/packaging/templates/runner.test262.html
index 9f51b6b02b64ed6831ef7b278e3105c4fa77d93f..cfb15391868e5fad8ad72e91608102ce0c49202f 100644
--- a/tools/packaging/templates/runner.test262.html
+++ b/tools/packaging/templates/runner.test262.html
@@ -2,18 +2,18 @@
<html dir="ltr" xmlns="http://www.w3.org/1999/xhtml">
<head>
<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="harness/sections.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery-1.4.2.min.js"></script>
+<script type="text/javascript" src="scripts/sections.js"></script>
<script type="text/javascript">
//Globals
var STANDARD = "ECMA-262";
var TEST_LIST_PATH = "json/testcaseslist.json";
</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/jqueryprogressbar.js"></script>
-<script type="text/javascript" src="harness/helper.js"></script>
-<script type="text/javascript" src="harness/jquery.base64.js"></script>
+<script type="text/javascript" src="scripts/lib/jqueryprogressbar.js"></script>
+<script type="text/javascript" src="scripts/helper.js"></script>
+<script type="text/javascript" src="scripts/lib/jquery.base64.js"></script>
<script type="text/javascript">
//To support all the browsers
$(window).resize(ResizeLoadIndicator);
diff --git a/tools/packaging/test262.py b/tools/packaging/test262.py
index ed8939e00a0b3a61f4866159d91df68fdca257cc..5a606bb1874dc84683d1fe8227eaebb1181f926b 100755
--- a/tools/packaging/test262.py
+++ b/tools/packaging/test262.py
@@ -277,7 +277,7 @@ class TestCase(object):
def GetIncludeList(self):
if self.testRecord.get('includes'):
return self.testRecord['includes']
- return re.findall('\$INCLUDE\([\'"]([^\)]+)[\'"]\)', self.test)
+ return []
def GetAdditionalIncludes(self):
return '\n'.join([self.suite.GetInclude(include) for include in self.GetIncludeList()])
diff --git a/harness/ed.js b/website/scripts/ed.js
similarity index 100%
rename from harness/ed.js
rename to website/scripts/ed.js
diff --git a/harness/gs.js b/website/scripts/gs.js
similarity index 100%
rename from harness/gs.js
rename to website/scripts/gs.js
diff --git a/harness/helper.js b/website/scripts/helper.js
similarity index 100%
rename from harness/helper.js
rename to website/scripts/helper.js
diff --git a/harness/jquery-1.4.2.min.js b/website/scripts/lib/jquery-1.4.2.min.js
similarity index 100%
rename from harness/jquery-1.4.2.min.js
rename to website/scripts/lib/jquery-1.4.2.min.js
diff --git a/harness/jquery.base64.js b/website/scripts/lib/jquery.base64.js
similarity index 100%
rename from harness/jquery.base64.js
rename to website/scripts/lib/jquery.base64.js
diff --git a/harness/jqueryprogressbar.js b/website/scripts/lib/jqueryprogressbar.js
similarity index 100%
rename from harness/jqueryprogressbar.js
rename to website/scripts/lib/jqueryprogressbar.js
diff --git a/harness/sections.js b/website/scripts/sections.js
similarity index 100%
rename from harness/sections.js
rename to website/scripts/sections.js
diff --git a/harness/sth.js b/website/scripts/sth.js
similarity index 96%
rename from harness/sth.js
rename to website/scripts/sth.js
index 2ac4245e84c0a7530c9a44d361eb87e5a0479f7b..a25a8c1ac7148dcac445b3d496054f9b26ff5544 100644
--- a/harness/sth.js
+++ b/website/scripts/sth.js
@@ -173,12 +173,7 @@ function BrowserRunner() {
include;
includes = test.includes;
- if (!includes || !(includes.length)) {
- // includes not specified via frontmatter; find all of the $INCLUDE statements
- includes = code.match(/\$INCLUDE\(([^\)]+)\)/g);
- }
-
- if (includes !== null) {
+ if (includes && includes.length) {
// We have some includes, so loop through each include and
// pull in the dependencies.
for (var i = 0; i < includes.length; i++) {