Bug 1085208 - Move dom/media/tests/identity into dom/media/tests/mochitest to force it to run with the other Mochitests. r=jib

--HG--
rename : dom/media/tests/identity/identityevent.js => dom/media/tests/mochitest/identity/identityevent.js
rename : dom/media/tests/identity/idp-proxy.js => dom/media/tests/mochitest/identity/idp-proxy.js
rename : dom/media/tests/identity/idp.html => dom/media/tests/mochitest/identity/idp.html
rename : dom/media/tests/identity/mochitest.ini => dom/media/tests/mochitest/identity/mochitest.ini
rename : dom/media/tests/identity/test_fingerprints.html => dom/media/tests/mochitest/identity/test_fingerprints.html
rename : dom/media/tests/identity/test_getIdentityAssertion.html => dom/media/tests/mochitest/identity/test_getIdentityAssertion.html
rename : dom/media/tests/identity/test_idpproxy.html => dom/media/tests/mochitest/identity/test_idpproxy.html
rename : dom/media/tests/identity/test_peerConnection_peerIdentity.html => dom/media/tests/mochitest/identity/test_peerConnection_peerIdentity.html
rename : dom/media/tests/identity/test_setIdentityProvider.html => dom/media/tests/mochitest/identity/test_setIdentityProvider.html
rename : dom/media/tests/identity/test_setIdentityProviderWithErrors.html => dom/media/tests/mochitest/identity/test_setIdentityProviderWithErrors.html
This commit is contained in:
Birunthan Mohanathas 2014-10-25 20:27:41 +03:00
parent 554eff3a21
commit c0be0d8eef
11 changed files with 16 additions and 16 deletions

View File

@ -64,8 +64,8 @@ MOCHITEST_CHROME_MANIFESTS += ['test/chrome.ini']
MOCHITEST_MANIFESTS += [
'test/mochitest.ini',
'tests/identity/mochitest.ini',
'tests/ipc/mochitest.ini',
'tests/mochitest/identity/mochitest.ini',
]
if CONFIG['MOZ_WEBRTC']:

View File

@ -17,4 +17,4 @@ support-files =
[test_fingerprints.html]
# Bug 950317: Hack for making a cleanup hook after finishing all WebRTC cases
[../mochitest/test_zmedia_cleanup.html]
[../test_zmedia_cleanup.html]

View File

@ -3,9 +3,9 @@
<head>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="../mochitest/head.js"></script>
<script type="application/javascript" src="../mochitest/pc.js"></script>
<script type="application/javascript" src="../mochitest/templates.js"></script>
<script type="application/javascript" src="../head.js"></script>
<script type="application/javascript" src="../pc.js"></script>
<script type="application/javascript" src="../templates.js"></script>
</head>
<body>
<pre id="test">

View File

@ -4,11 +4,11 @@
<meta charset="utf-8"/>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="../mochitest/head.js"></script>
<script type="application/javascript" src="../mochitest/pc.js"></script>
<script type="application/javascript" src="../mochitest/templates.js"></script>
<script type="application/javascript" src="../mochitest/blacksilence.js"></script>
<script type="application/javascript" src="../mochitest/turnConfig.js"></script>
<script type="application/javascript" src="../head.js"></script>
<script type="application/javascript" src="../pc.js"></script>
<script type="application/javascript" src="../templates.js"></script>
<script type="application/javascript" src="../blacksilence.js"></script>
<script type="application/javascript" src="../turnConfig.js"></script>
</head>
<body>
<div id="display"></div>

View File

@ -4,9 +4,9 @@
<meta charset="utf-8"/>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="../mochitest/head.js"></script>
<script type="application/javascript" src="../mochitest/pc.js"></script>
<script type="application/javascript" src="../mochitest/templates.js"></script>
<script type="application/javascript" src="../head.js"></script>
<script type="application/javascript" src="../pc.js"></script>
<script type="application/javascript" src="../templates.js"></script>
<script type="application/javascript" src="identityevent.js"></script>
</head>
<body>

View File

@ -3,9 +3,9 @@
<head>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css"/>
<script type="application/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<script type="application/javascript" src="../mochitest/head.js"></script>
<script type="application/javascript" src="../mochitest/pc.js"></script>
<script type="application/javascript" src="../mochitest/templates.js"></script>
<script type="application/javascript" src="../head.js"></script>
<script type="application/javascript" src="../pc.js"></script>
<script type="application/javascript" src="../templates.js"></script>
<script type="application/javascript" src="identityevent.js"></script>
</head>
<body>