Bug 1341476 - Make the dump-dmd-after-test mochitest option work again. r?jmaher
MozReview-Commit-ID: 85oqrrzyYUR
--- a/testing/mochitest/mochitest_options.py
+++ b/testing/mochitest/mochitest_options.py
@@ -472,18 +472,20 @@ class MochitestArguments(ArgumentContain
"dest": "dumpAboutMemoryAfterTest",
"help": "Dump an about:memory log after each test in the directory specified "
"by --dump-output-directory.",
}],
[["--dump-dmd-after-test"],
{"action": "store_true",
"default": False,
"dest": "dumpDMDAfterTest",
- "help": "Dump a DMD log after each test in the directory specified "
- "by --dump-output-directory.",
+ "help": "Dump a DMD log (and an accompanying about:memory log) after each test. "
+ "These will be dumped into your default temp directory, NOT the directory "
+ "specified by --dump-output-directory. The logs are numbered by test, and "
+ "each test will include output that indicates the DMD output filename.",
}],
[["--screenshot-on-fail"],
{"action": "store_true",
"default": False,
"dest": "screenshotOnFail",
"help": "Take screenshots on all test failures. Set $MOZ_UPLOAD_DIR to a directory "
"for storing the screenshots."
}],
--- a/testing/mochitest/tests/SimpleTest/MemoryStats.js
+++ b/testing/mochitest/tests/SimpleTest/MemoryStats.js
@@ -98,25 +98,16 @@ MemoryStats.dump = function (testNumber,
info(testURL + " | MEMDUMP-START " + dumpfile);
var md = MemoryStats._getService("@mozilla.org/memory-info-dumper;1",
"nsIMemoryInfoDumper");
md.dumpMemoryReportsToNamedFile(dumpfile, function () {
info("TEST-INFO | " + testURL + " | MEMDUMP-END");
}, null, /* anonymize = */ false);
}
- // This is the old, deprecated function.
- if (dumpDMD && typeof(DMDReportAndDump) != "undefined") {
- var basename = "dmd-" + testNumber + "-deprecated.txt";
- var dumpfile = MemoryStats.constructPathname(dumpOutputDirectory,
- basename);
- info(testURL + " | DMD-DUMP-deprecated " + dumpfile);
- DMDReportAndDump(dumpfile);
- }
-
- if (dumpDMD && typeof(DMDAnalyzeReports) != "undefined") {
- var basename = "dmd-" + testNumber + ".txt";
- var dumpfile = MemoryStats.constructPathname(dumpOutputDirectory,
- basename);
- info(testURL + " | DMD-DUMP " + dumpfile);
- DMDAnalyzeReports(dumpfile);
+ if (dumpDMD) {
+ var md = MemoryStats._getService("@mozilla.org/memory-info-dumper;1",
+ "nsIMemoryInfoDumper");
+ md.dumpMemoryInfoToTempDir(String(testNumber),
+ /* anonymize = */ false,
+ /* minimize memory usage = */ false);
}
};