From 0ddd00f1959c78ce37c14fef3c83401408fca3bf Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Tue, 25 Feb 2020 15:07:00 -0500 Subject: Issue #439 - Remove tests from toolkit/ --- toolkit/components/aboutmemory/moz.build | 5 - toolkit/components/aboutmemory/tests/.eslintrc.js | 7 - toolkit/components/aboutmemory/tests/chrome.ini | 28 - .../aboutmemory/tests/crash-dump-diff1.json | 11 - .../aboutmemory/tests/crash-dump-diff2.json | 11 - .../aboutmemory/tests/crash-dump-good.json | 14 - .../aboutmemory/tests/memory-reports-bad.json | 3 - .../aboutmemory/tests/memory-reports-diff1.json | 45 -- .../aboutmemory/tests/memory-reports-diff2.json | 44 -- .../aboutmemory/tests/memory-reports-good.json | 29 - toolkit/components/aboutmemory/tests/remote.xul | 12 - .../aboutmemory/tests/test_aboutmemory.xul | 602 --------------------- .../aboutmemory/tests/test_aboutmemory2.xul | 423 --------------- .../aboutmemory/tests/test_aboutmemory3.xul | 515 ------------------ .../aboutmemory/tests/test_aboutmemory4.xul | 179 ------ .../aboutmemory/tests/test_aboutmemory5.xul | 167 ------ .../aboutmemory/tests/test_aboutmemory6.xul | 88 --- .../tests/test_dumpGCAndCCLogsToFile.xul | 98 ---- .../aboutmemory/tests/test_memoryReporters.xul | 424 --------------- .../aboutmemory/tests/test_memoryReporters2.xul | 108 ---- .../aboutmemory/tests/test_sqliteMultiReporter.xul | 54 -- 21 files changed, 2867 deletions(-) delete mode 100644 toolkit/components/aboutmemory/tests/.eslintrc.js delete mode 100644 toolkit/components/aboutmemory/tests/chrome.ini delete mode 100644 toolkit/components/aboutmemory/tests/crash-dump-diff1.json delete mode 100644 toolkit/components/aboutmemory/tests/crash-dump-diff2.json delete mode 100644 toolkit/components/aboutmemory/tests/crash-dump-good.json delete mode 100644 toolkit/components/aboutmemory/tests/memory-reports-bad.json delete mode 100644 toolkit/components/aboutmemory/tests/memory-reports-diff1.json delete mode 100644 toolkit/components/aboutmemory/tests/memory-reports-diff2.json delete mode 100644 toolkit/components/aboutmemory/tests/memory-reports-good.json delete mode 100644 toolkit/components/aboutmemory/tests/remote.xul delete mode 100644 toolkit/components/aboutmemory/tests/test_aboutmemory.xul delete mode 100644 toolkit/components/aboutmemory/tests/test_aboutmemory2.xul delete mode 100644 toolkit/components/aboutmemory/tests/test_aboutmemory3.xul delete mode 100644 toolkit/components/aboutmemory/tests/test_aboutmemory4.xul delete mode 100644 toolkit/components/aboutmemory/tests/test_aboutmemory5.xul delete mode 100644 toolkit/components/aboutmemory/tests/test_aboutmemory6.xul delete mode 100644 toolkit/components/aboutmemory/tests/test_dumpGCAndCCLogsToFile.xul delete mode 100644 toolkit/components/aboutmemory/tests/test_memoryReporters.xul delete mode 100644 toolkit/components/aboutmemory/tests/test_memoryReporters2.xul delete mode 100644 toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul (limited to 'toolkit/components/aboutmemory') diff --git a/toolkit/components/aboutmemory/moz.build b/toolkit/components/aboutmemory/moz.build index dd3f71d8c..aac3a838c 100644 --- a/toolkit/components/aboutmemory/moz.build +++ b/toolkit/components/aboutmemory/moz.build @@ -4,9 +4,4 @@ # License, v. 2.0. If a copy of the MPL was not distributed with this # file, You can obtain one at http://mozilla.org/MPL/2.0/. -MOCHITEST_CHROME_MANIFESTS += ['tests/chrome.ini'] - JAR_MANIFESTS += ['jar.mn'] - -with Files('**'): - BUG_COMPONENT = ('Toolkit', 'about:memory') diff --git a/toolkit/components/aboutmemory/tests/.eslintrc.js b/toolkit/components/aboutmemory/tests/.eslintrc.js deleted file mode 100644 index 2c669d844..000000000 --- a/toolkit/components/aboutmemory/tests/.eslintrc.js +++ /dev/null @@ -1,7 +0,0 @@ -"use strict"; - -module.exports = { - "extends": [ - "../../../../testing/mochitest/chrome.eslintrc.js" - ] -}; diff --git a/toolkit/components/aboutmemory/tests/chrome.ini b/toolkit/components/aboutmemory/tests/chrome.ini deleted file mode 100644 index c25bc30a0..000000000 --- a/toolkit/components/aboutmemory/tests/chrome.ini +++ /dev/null @@ -1,28 +0,0 @@ -[DEFAULT] -skip-if = os == 'android' -support-files = - crash-dump-diff1.json - crash-dump-diff2.json - crash-dump-good.json - memory-reports-bad.json - memory-reports-diff1.json - memory-reports-diff2.json - memory-reports-good.json - remote.xul - -[test_aboutmemory.xul] -subsuite = clipboard -[test_aboutmemory2.xul] -subsuite = clipboard -[test_aboutmemory3.xul] -subsuite = clipboard -[test_aboutmemory4.xul] -subsuite = clipboard -[test_aboutmemory5.xul] -subsuite = clipboard -skip-if = asan # Bug 1116230 -[test_aboutmemory6.xul] -[test_memoryReporters.xul] -[test_memoryReporters2.xul] -[test_sqliteMultiReporter.xul] -[test_dumpGCAndCCLogsToFile.xul] diff --git a/toolkit/components/aboutmemory/tests/crash-dump-diff1.json b/toolkit/components/aboutmemory/tests/crash-dump-diff1.json deleted file mode 100644 index d41bbcc61..000000000 --- a/toolkit/components/aboutmemory/tests/crash-dump-diff1.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "foo": 1, - "blah": 2, - "memory_report": { - "version": 1, - "hasMozMallocUsableSize": true, - "reports": [ - {"process": "Main Process (pid NNN)", "path": "heap-allocated", "kind": 2, "units": 0, "amount": 262144000, "description": "Heap allocated."} - ] - } -} diff --git a/toolkit/components/aboutmemory/tests/crash-dump-diff2.json b/toolkit/components/aboutmemory/tests/crash-dump-diff2.json deleted file mode 100644 index 8f9451f62..000000000 --- a/toolkit/components/aboutmemory/tests/crash-dump-diff2.json +++ /dev/null @@ -1,11 +0,0 @@ -{ - "foo": 3, - "blah": 4, - "memory_report": { - "version": 1, - "hasMozMallocUsableSize": true, - "reports": [ - {"process": "Main Process (pid NNN)", "path": "heap-allocated", "kind": 2, "units": 0, "amount": 262144001, "description": "Heap allocated."} - ] - } -} diff --git a/toolkit/components/aboutmemory/tests/crash-dump-good.json b/toolkit/components/aboutmemory/tests/crash-dump-good.json deleted file mode 100644 index 6bee54d59..000000000 --- a/toolkit/components/aboutmemory/tests/crash-dump-good.json +++ /dev/null @@ -1,14 +0,0 @@ -{ - "foo": 1, - "blah": 2, - "memory_report": { - "version": 1, - "hasMozMallocUsableSize": true, - "reports": [ - {"process": "Main Process (pid NNN)", "path": "heap-allocated", "kind": 2, "units": 0, "amount": 262144000, "description": "Heap allocated."}, - {"process": "Main Process (pid NNN)", "path": "other/b", "kind": 2, "units": 0, "amount": 104857, "description": "Other b."}, - {"process": "Main Process (pid NNN)", "path": "other/a", "kind": 2, "units": 0, "amount": 209715, "description": "Other a."}, - {"process": "Main Process (pid NNN)", "path": "explicit/a/b", "kind": 1, "units": 0, "amount": 52428800, "description": "A b."} - ] - } -} diff --git a/toolkit/components/aboutmemory/tests/memory-reports-bad.json b/toolkit/components/aboutmemory/tests/memory-reports-bad.json deleted file mode 100644 index 61a2092b1..000000000 --- a/toolkit/components/aboutmemory/tests/memory-reports-bad.json +++ /dev/null @@ -1,3 +0,0 @@ -{ - "version": 1 -} diff --git a/toolkit/components/aboutmemory/tests/memory-reports-diff1.json b/toolkit/components/aboutmemory/tests/memory-reports-diff1.json deleted file mode 100644 index 0bfe0b26b..000000000 --- a/toolkit/components/aboutmemory/tests/memory-reports-diff1.json +++ /dev/null @@ -1,45 +0,0 @@ -{ - "version": 1, - "hasMozMallocUsableSize": true, - "reports": [ - {"process": "P", "path": "explicit/xpcom/category-manager", "kind": 1, "units": 0, "amount": 56848, "description": "Desc."}, - {"process": "P", "path": "explicit/storage/prefixset/goog-phish-shavar", "kind": 1, "units": 0, "amount": 680000, "description": "Desc."}, - - {"process": "P", "path": "explicit/spell-check", "kind": 1, "units": 0, "amount": 4, "description": "Desc."}, - {"process": "P", "path": "explicit/spell-check", "kind": 1, "units": 0, "amount": 5, "description": "Desc."}, - - {"process": "P", "path": "page-faults-soft", "kind": 2, "units": 2, "amount": 61013, "description": "Desc."}, - - {"process": "P", "path": "foobar", "kind": 2, "units": 0, "amount": 100, "description": "Desc."}, - {"process": "P", "path": "zero1", "kind": 2, "units": 0, "amount": 0, "description": "Desc."}, - - {"process": "P", "path": "a/b", "kind": 2, "units": 0, "amount": 1000000, "description": "Desc."}, - {"process": "P", "path": "a/c/d", "kind": 2, "units": 0, "amount": 2000000, "description": "Desc."}, - {"process": "P", "path": "a/c/e", "kind": 2, "units": 0, "amount": 2000000, "description": "Desc."}, - {"process": "P", "path": "a/c/f", "kind": 2, "units": 0, "amount": 3000000, "description": "Desc."}, - {"process": "P", "path": "a/c/g", "kind": 2, "units": 0, "amount": 3000000, "description": "Desc."}, - {"process": "P", "path": "a/h", "kind": 2, "units": 0, "amount": 1000, "description": "Desc."}, - - {"process": "P2 (pid 22)", "path": "p1 (pid 123)", "kind": 2, "units": 0, "amount": 33, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "p2 (blah, pid=123)", "kind": 2, "units": 0, "amount": 33, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "p3/zone(0x1234)/p3", "kind": 2, "units": 0, "amount": 33, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "p4/js-zone(0x1234)/p4", "kind": 2, "units": 0, "amount": 33, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "p5/worker(foo.com, 0x1234)/p5", "kind": 2, "units": 0, "amount": 33, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "explicit/window-objects/top(bar.com, id=123)/...", "kind": 0, "units": 0, "amount": 33, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "p6/z-moz-nullprincipal:{85e250f3-57ae-46c4-a11e-4176dd39d9c5}/p6", "kind": 2, "units": 0, "amount": 33, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "p7/js-main-runtime-compartments/system/jar:file:\\\\\\temp_xyz\\firefox\\omni.ja!/p7", "kind": 2, "units": 0, "amount": 33, "description": "Desc."}, - - {"process": "P3", "path": "p3", "kind": 2, "units": 0, "amount": 55, "description": "Desc."}, - - {"process": "P5", "path": "p5", "kind": 2, "units": 0, "amount": 0, "description": "Desc."}, - - {"process": "P7", "path": "p7", "kind": 2, "units": 0, "amount": 5, "description": "Desc."}, - - {"process": "P8", "path": "p8/a/b/c/d", "kind": 2, "units": 0, "amount": 3, "description": "Desc."}, - {"process": "P8", "path": "p8/a/b/c/e", "kind": 2, "units": 0, "amount": 4, "description": "Desc."}, - {"process": "P8", "path": "p8/a/b/f", "kind": 2, "units": 0, "amount": 5, "description": "Desc."}, - {"process": "P8", "path": "p8/a/g/h", "kind": 2, "units": 0, "amount": 6, "description": "Desc."}, - {"process": "P8", "path": "p8/a/g/i", "kind": 2, "units": 0, "amount": 7, "description": "Desc."} - ] -} - diff --git a/toolkit/components/aboutmemory/tests/memory-reports-diff2.json b/toolkit/components/aboutmemory/tests/memory-reports-diff2.json deleted file mode 100644 index e2ef4caa7..000000000 --- a/toolkit/components/aboutmemory/tests/memory-reports-diff2.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "version": 1, - "hasMozMallocUsableSize": true, - "reports": [ - {"process": "P", "path": "explicit/xpcom/category-manager", "kind": 1, "units": 0, "amount": 56849, "description": "Desc."}, - {"process": "P", "path": "explicit/storage/prefixset/goog-phish-shavar", "kind": 1, "units": 0, "amount": 670000, "description": "Desc."}, - - {"process": "P", "path": "explicit/spell-check", "kind": 1, "units": 0, "amount": 3, "description": "Desc."}, - - {"process": "P", "path": "page-faults-soft", "kind": 2, "units": 2, "amount": 61013, "description": "Desc."}, - - {"process": "P", "path": "canvas-2d-pixel-bytes", "kind": 2, "units": 0, "amount": 1000, "description": "Desc."}, - {"process": "P", "path": "canvas-2d-pixel-bytes", "kind": 2, "units": 0, "amount": 2000, "description": "Desc."}, - - {"process": "P", "path": "foobaz", "kind": 2, "units": 0, "amount": 0, "description": "Desc."}, - - {"process": "P", "path": "a/b", "kind": 2, "units": 0, "amount": 2000000, "description": "Desc."}, - {"process": "P", "path": "a/c/d", "kind": 2, "units": 0, "amount": 2998000, "description": "Desc."}, - {"process": "P", "path": "a/c/e", "kind": 2, "units": 0, "amount": 1001000, "description": "Desc."}, - {"process": "P", "path": "a/c/f", "kind": 2, "units": 0, "amount": 3001000, "description": "Desc."}, - {"process": "P", "path": "a/c/g", "kind": 2, "units": 0, "amount": 3001000, "description": "Desc."}, - {"process": "P", "path": "a/h", "kind": 2, "units": 0, "amount": 2000, "description": "Desc."}, - - {"process": "P2 (pid 22)", "path": "p1 (pid 456)", "kind": 2, "units": 0, "amount": 44, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "p2 (blah, pid=456)", "kind": 2, "units": 0, "amount": 44, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "p3/zone(0x5678)/p3", "kind": 2, "units": 0, "amount": 44, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "p4/js-zone(0x5678)/p4", "kind": 2, "units": 0, "amount": 44, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "p5/worker(foo.com, 0x5678)/p5", "kind": 2, "units": 0, "amount": 44, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "explicit/window-objects/top(bar.com, id=456)/...", "kind": 0, "units": 0, "amount": 44, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "p6/z-moz-nullprincipal:{161effaa-c1f7-4010-a08e-e7c9aea01aed}/p6", "kind": 2, "units": 0, "amount": 44, "description": "Desc."}, - {"process": "P2 (pid 22)", "path": "p7/js-main-runtime-compartments/system/jar:file:\\\\\\temp_abc\\firefox\\omni.ja!/p7", "kind": 2, "units": 0, "amount": 44, "description": "Desc."}, - - {"process": "P4", "path": "p4", "kind": 2, "units": 0, "amount": 66, "description": "Desc."}, - - {"process": "P6", "path": "p6", "kind": 2, "units": 0, "amount": 0, "description": "Desc."}, - - {"process": "P7", "path": "p7/b", "kind": 2, "units": 0, "amount": 3, "description": "Desc."}, - {"process": "P7", "path": "p7/c", "kind": 2, "units": 0, "amount": 4, "description": "Desc."}, - - {"process": "P8", "path": "p8/a/b", "kind": 2, "units": 0, "amount": 1, "description": "Desc."}, - {"process": "P8", "path": "p8/a/g", "kind": 2, "units": 0, "amount": 2, "description": "Desc."} - ] -} - diff --git a/toolkit/components/aboutmemory/tests/memory-reports-good.json b/toolkit/components/aboutmemory/tests/memory-reports-good.json deleted file mode 100644 index 013b4b125..000000000 --- a/toolkit/components/aboutmemory/tests/memory-reports-good.json +++ /dev/null @@ -1,29 +0,0 @@ -{ - "version": 1, - "hasMozMallocUsableSize": true, - "reports": [ - {"process": "Main Process (pid NNN)", "path": "heap-allocated", "kind": 2, "units": 0, "amount": 262144000, "description": "Heap allocated."}, - {"process": "Main Process (pid NNN)", "path": "other/b", "kind": 2, "units": 0, "amount": 104857, "description": "Other b."}, - {"process": "Main Process (pid NNN)", "path": "other/a", "kind": 2, "units": 0, "amount": 209715, "description": "Other a."}, - {"process": "Main Process (pid NNN)", "path": "explicit/a/b", "kind": 1, "units": 0, "amount": 52428800, "description": "A b."}, - - {"process": "Main Process (pid NNN)", "path": "size/a", "kind": 1, "units": 0, "amount": 1024, "description": "non-sentence"}, - {"process": "Main Process (pid NNN)", "path": "rss/a", "kind": 1, "units": 0, "amount": 1024, "description": "non-sentence"}, - {"process": "Main Process (pid NNN)", "path": "pss/a", "kind": 1, "units": 0, "amount": 1024, "description": "non-sentence"}, - {"process": "Main Process (pid NNN)", "path": "swap/a", "kind": 1, "units": 0, "amount": 1024, "description": "non-sentence"}, - {"process": "Main Process (pid NNN)", "path": "compartments/system/a", "kind": 1, "units": 0, "amount": 1024, "description": ""}, - {"process": "Main Process (pid NNN)", "path": "ghost-windows/a", "kind": 1, "units": 0, "amount": 1024, "description": ""}, - - {"process": "Main Process (pid NNN)", "path": "redundant/should-be-ignored", "kind": 1, "units": 0, "amount": 1024, "description": ""}, - - {"process": "Heap-unclassified process", "path": "heap-allocated", "kind": 2, "units": 0, "amount": 262144000, "description": "Heap allocated."}, - {"process": "Heap-unclassified process", "path": "explicit/a/b", "kind": 1, "units": 0, "amount": 52428800, "description": "A b."}, - {"process": "Heap-unclassified process", "path": "explicit/heap-unclassified", "kind": 1, "units": 0, "amount": 209715200, "description": "Heap unclassified"}, - - {"process": "Explicit-only process", "path": "explicit/a/b", "kind": 1, "units": 0, "amount": 100000, "description": "A b."}, - - {"process": "Other-only process", "path": "a/b", "kind": 1, "units": 0, "amount": 100000, "description": "A b."}, - {"process": "Other-only process", "path": "a/c", "kind": 1, "units": 0, "amount": 100000, "description": "A c."}, - {"process": "Other-only process", "path": "heap-allocated", "kind": 1, "units": 0, "amount": 500000, "description": "D."} - ] -} diff --git a/toolkit/components/aboutmemory/tests/remote.xul b/toolkit/components/aboutmemory/tests/remote.xul deleted file mode 100644 index 7d6910130..000000000 --- a/toolkit/components/aboutmemory/tests/remote.xul +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - -

Remote browser

- - -
diff --git a/toolkit/components/aboutmemory/tests/test_aboutmemory.xul b/toolkit/components/aboutmemory/tests/test_aboutmemory.xul deleted file mode 100644 index bfeab4c7b..000000000 --- a/toolkit/components/aboutmemory/tests/test_aboutmemory.xul +++ /dev/null @@ -1,602 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/toolkit/components/aboutmemory/tests/test_aboutmemory2.xul b/toolkit/components/aboutmemory/tests/test_aboutmemory2.xul deleted file mode 100644 index 8cf197e6d..000000000 --- a/toolkit/components/aboutmemory/tests/test_aboutmemory2.xul +++ /dev/null @@ -1,423 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul b/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul deleted file mode 100644 index c712070cc..000000000 --- a/toolkit/components/aboutmemory/tests/test_aboutmemory3.xul +++ /dev/null @@ -1,515 +0,0 @@ - - - - - - - - - - - - - - - - - - diff --git a/toolkit/components/aboutmemory/tests/test_aboutmemory4.xul b/toolkit/components/aboutmemory/tests/test_aboutmemory4.xul deleted file mode 100644 index f2c752ac5..000000000 --- a/toolkit/components/aboutmemory/tests/test_aboutmemory4.xul +++ /dev/null @@ -1,179 +0,0 @@ - - - - - - - - - - - - - - diff --git a/toolkit/components/aboutmemory/tests/test_aboutmemory5.xul b/toolkit/components/aboutmemory/tests/test_aboutmemory5.xul deleted file mode 100644 index 2fec803b9..000000000 --- a/toolkit/components/aboutmemory/tests/test_aboutmemory5.xul +++ /dev/null @@ -1,167 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/toolkit/components/aboutmemory/tests/test_aboutmemory6.xul b/toolkit/components/aboutmemory/tests/test_aboutmemory6.xul deleted file mode 100644 index 365f99091..000000000 --- a/toolkit/components/aboutmemory/tests/test_aboutmemory6.xul +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/toolkit/components/aboutmemory/tests/test_dumpGCAndCCLogsToFile.xul b/toolkit/components/aboutmemory/tests/test_dumpGCAndCCLogsToFile.xul deleted file mode 100644 index a39869b7d..000000000 --- a/toolkit/components/aboutmemory/tests/test_dumpGCAndCCLogsToFile.xul +++ /dev/null @@ -1,98 +0,0 @@ - - - - - - diff --git a/toolkit/components/aboutmemory/tests/test_memoryReporters.xul b/toolkit/components/aboutmemory/tests/test_memoryReporters.xul deleted file mode 100644 index 9d56890b3..000000000 --- a/toolkit/components/aboutmemory/tests/test_memoryReporters.xul +++ /dev/null @@ -1,424 +0,0 @@ - - - - - - diff --git a/toolkit/components/aboutmemory/tests/test_memoryReporters2.xul b/toolkit/components/aboutmemory/tests/test_memoryReporters2.xul deleted file mode 100644 index 0e8ba2e81..000000000 --- a/toolkit/components/aboutmemory/tests/test_memoryReporters2.xul +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - diff --git a/toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul b/toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul deleted file mode 100644 index 3452bbbc7..000000000 --- a/toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - -- cgit v1.2.3