bug 1005355 - look for PSM test binaries in /data/local/xpcb/ on Android/B2G r=mmc

This commit is contained in:
David Keeler 2014-05-12 14:38:00 -07:00
parent 90aae4640a
commit c441103da0
2 changed files with 23 additions and 17 deletions

View File

@ -319,6 +319,11 @@ function _getBinaryUtil(binaryUtilName) {
utilBin.append("bin");
utilBin.append(binaryUtilName + (gIsWindows ? ".exe" : ""));
}
// But maybe we're on Android or B2G, where binaries are in /data/local/xpcb.
if (!utilBin.exists()) {
utilBin.initWithPath("/data/local/xpcb/");
utilBin.append(binaryUtilName);
}
do_check_true(utilBin.exists());
return utilBin;
}

View File

@ -29,37 +29,38 @@ skip-if = buildapp == "b2g" && processor = "arm"
[test_certificate_usages.js]
[test_ocsp_stapling.js]
run-sequentially = hardcoded ports
# Bug 676972: test fails consistently on Android and B2G
fail-if = os == "android" || buildapp == "b2g"
# Bug 1009158: this test times out on Android
skip-if = os == "android"
[test_ocsp_stapling_expired.js]
run-sequentially = hardcoded ports
# Bug 676972: test fails consistently on Android and B2G
fail-if = os == "android" || buildapp == "b2g"
# Bug 1009158: this test times out on Android
skip-if = os == "android"
[test_ocsp_stapling_with_intermediate.js]
run-sequentially = hardcoded ports
# Bug 676972: test fails consistently on Android and B2G
fail-if = os == "android" || buildapp == "b2g"
# Bug 1009158: this test times out on Android
skip-if = os == "android"
[test_ocsp_caching.js]
run-sequentially = hardcoded ports
# Bug 676972: test fails consistently on Android and B2G
fail-if = os == "android" || buildapp == "b2g"
# Bug 1009158: this test times out on Android
skip-if = os == "android"
[test_ocsp_required.js]
run-sequentially = hardcoded ports
# Bug 676972: test fails consistently on Android and B2G
fail-if = os == "android" || buildapp == "b2g"
# Bug 1009158: this test times out on Android
skip-if = os == "android"
[test_ocsp_timeout.js]
run-sequentially = hardcoded ports
# Bug 676972: test fails consistently on Android and B2G
fail-if = os == "android" || buildapp == "b2g"
# Bug 1009158: this test times out on Android
skip-if = os == "android"
[test_cert_signatures.js]
[test_ev_certs.js]
# Bug 676972: test fails consistently on Android and B2G
# Bug 1009158: this test times out on Android
# Bug 1008316: Test needs modification to work on B2G
fail-if = os == "android" || buildapp == "b2g"
[test_getchain.js]
[test_cert_overrides.js]
run-sequentially = hardcoded ports
# Bug 676972: test fails consistently on Android and B2G
fail-if = os == "android" || buildapp == "b2g"
# Bug 1009158: this test times out on Android
skip-if = os == "android"
[test_intermediate_basic_usage_constraints.js]
[test_name_constraints.js]
[test_cert_trust.js]
@ -72,5 +73,5 @@ skip-if = os == "android" || (buildapp == "b2g" && processor == "arm")
requesttimeoutfactor = 4
[test_pinning.js]
run-sequentially = hardcoded ports
# Bug 676972: test fails consistently on Android and B2G
fail-if = os == "android" || buildapp == "b2g"
# Bug 1009158: this test times out on Android
skip-if = os == "android"