diff options
| author | cstefansen@google.com <cstefansen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 19:15:08 +0000 |
|---|---|---|
| committer | cstefansen@google.com <cstefansen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-04-28 19:15:08 +0000 |
| commit | 849b07153012ac47bff20732170ac4060bd8a16c (patch) | |
| tree | 40ff7afad34ac3bfd38ea23875a361c0db9be362 /ppapi/tests/test_case.html | |
| parent | 352f6e99613e7824d1d82b1e45fd947852bfdf4e (diff) | |
| download | chromium_src-849b07153012ac47bff20732170ac4060bd8a16c.zip chromium_src-849b07153012ac47bff20732170ac4060bd8a16c.tar.gz chromium_src-849b07153012ac47bff20732170ac4060bd8a16c.tar.bz2 | |
Minor fixes to enable manual running of all PPAPI tests ("Run all tests"
button was broken). Add missing instance_ parameter to constructors in several
places. This fixes most of the URLLoader tests. DirectoryReader still fails,
but at a later point. More CLs to follow.
The nacl.scons is not currently active, as it is commented out in the NaCl
repository and not used in the Chrome repo. A forthcoming CL will fix this.
TEST= Follow instructions at https://sites.google.com/a/chromium.org/dev/developers/design-documents/pepper-plugin-implementation
BUG= http://code.google.com/p/nativeclient/issues/detail?id=1671
Review URL: http://codereview.chromium.org/6904071
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@83375 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/tests/test_case.html')
| -rw-r--r-- | ppapi/tests/test_case.html | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/ppapi/tests/test_case.html b/ppapi/tests/test_case.html index 5fd094c..d055e52 100644 --- a/ppapi/tests/test_case.html +++ b/ppapi/tests/test_case.html @@ -1,4 +1,6 @@ <html><head> +<meta http-equiv="Pragma" content="no-cache" /> +<meta http-equiv="Expires" content="-1" /> <link rel="stylesheet" href="test_page.css"> <script> function AdjustHeight(frameWin) { @@ -25,7 +27,11 @@ function AppendFrame(testcase, i) { p.appendChild(title); var frame = document.createElement("IFRAME"); - frame.setAttribute("src", "?" + testcase); + var mode = ExtractSearchParameter("mode"); + if (mode == "nacl") + frame.setAttribute("src", "?testcase=" + testcase + "&mode=nacl"); + else + frame.setAttribute("src", "?testcase=" + testcase); frame.setAttribute("onload", "LoadNext(" + (i + 1) + ")"); p.appendChild(frame); @@ -66,10 +72,9 @@ onload = function() { document.title = 'Test ' + testcase; var obj; if (mode == "nacl") { - var nexes = "ARM: ppapi_tests_arm.nexe \nx86-32: ppapi_tests.nexe \nx86-64: ppapi_tests_x86_64."; obj = document.createElement("OBJECT"); - obj.setAttribute("type", "application/x-ppapi-nacl-srpc"); - obj.setAttribute("nexes", nexes); + obj.setAttribute("type", "application/x-nacl"); + obj.setAttribute("nacl", "test_case.nmf"); obj.setAttribute("mode", mode); } else { var mimeType = "application/x-ppapi-tests"; |