diff --git a/test/library/packages/ConcurrentMap/EXECOPTS b/test/library/packages/ConcurrentMap/memLeakTests/EXECOPTS similarity index 100% rename from test/library/packages/ConcurrentMap/EXECOPTS rename to test/library/packages/ConcurrentMap/memLeakTests/EXECOPTS diff --git a/test/library/packages/ConcurrentMap/memLeakTests/PREDIFF b/test/library/packages/ConcurrentMap/memLeakTests/PREDIFF new file mode 100755 index 000000000000..c280ebc44fa4 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/PREDIFF @@ -0,0 +1,4 @@ +#!/bin/bash + +grep -v "\.chpl:.*" < $2 >$2.predifftmp +mv $2.predifftmp $2 diff --git a/test/library/packages/ConcurrentMap/memLeakTests/README b/test/library/packages/ConcurrentMap/memLeakTests/README new file mode 100644 index 000000000000..6f1ee80cc2d6 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/README @@ -0,0 +1,3 @@ +This directory is locking down that we currently have a memory leak for +ConcurrentMap. These tests symlink to equivalent correctness tests and can be +removed once this leak is fixed. diff --git a/test/library/packages/ConcurrentMap/memLeakTests/testAddSet.chpl b/test/library/packages/ConcurrentMap/memLeakTests/testAddSet.chpl new file mode 120000 index 000000000000..8e0a14cc9f70 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testAddSet.chpl @@ -0,0 +1 @@ +../testAddSet.chpl \ No newline at end of file diff --git a/test/library/packages/ConcurrentMap/memLeakTests/testAddSet.good b/test/library/packages/ConcurrentMap/memLeakTests/testAddSet.good new file mode 100644 index 000000000000..2928500295d4 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testAddSet.good @@ -0,0 +1,7 @@ +{1: -1} + +================================================= Memory Leaks ================================================== +Allocated Memory (Bytes) Number Size Total Description Address +================================================================================================================= +================================================================================================================= + diff --git a/test/library/packages/ConcurrentMap/memLeakTests/testClear.chpl b/test/library/packages/ConcurrentMap/memLeakTests/testClear.chpl new file mode 120000 index 000000000000..94d96fdc965c --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testClear.chpl @@ -0,0 +1 @@ +../testClear.chpl \ No newline at end of file diff --git a/test/library/packages/ConcurrentMap/memLeakTests/testClear.good b/test/library/packages/ConcurrentMap/memLeakTests/testClear.good new file mode 100644 index 000000000000..d9dea1fdb7ed --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testClear.good @@ -0,0 +1,7 @@ +{} + +================================================= Memory Leaks ================================================== +Allocated Memory (Bytes) Number Size Total Description Address +================================================================================================================= +================================================================================================================= + diff --git a/test/library/packages/ConcurrentMap/memLeakTests/testEquality.chpl b/test/library/packages/ConcurrentMap/memLeakTests/testEquality.chpl new file mode 120000 index 000000000000..57d5974d2997 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testEquality.chpl @@ -0,0 +1 @@ +../testEquality.chpl \ No newline at end of file diff --git a/test/library/packages/ConcurrentMap/memLeakTests/testEquality.good b/test/library/packages/ConcurrentMap/memLeakTests/testEquality.good new file mode 100644 index 000000000000..d436507e54bf --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testEquality.good @@ -0,0 +1,10 @@ +true +false +false +true + +================================================= Memory Leaks ================================================== +Allocated Memory (Bytes) Number Size Total Description Address +================================================================================================================= +================================================================================================================= + diff --git a/test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.chpl b/test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.chpl new file mode 120000 index 000000000000..d103c14f2eea --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.chpl @@ -0,0 +1 @@ +../testGetRemove.chpl \ No newline at end of file diff --git a/test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.good b/test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.good new file mode 100644 index 000000000000..d12246d4ce37 --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/testGetRemove.good @@ -0,0 +1,8 @@ +1 +{two: 2} + +================================================= Memory Leaks ================================================== +Allocated Memory (Bytes) Number Size Total Description Address +================================================================================================================= +================================================================================================================= + diff --git a/test/library/packages/ConcurrentMap/memLeakTests/utilFunctions.chpl b/test/library/packages/ConcurrentMap/memLeakTests/utilFunctions.chpl new file mode 120000 index 000000000000..3e9526589b0d --- /dev/null +++ b/test/library/packages/ConcurrentMap/memLeakTests/utilFunctions.chpl @@ -0,0 +1 @@ +../utilFunctions.chpl \ No newline at end of file diff --git a/test/library/packages/ConcurrentMap/memLeakTests/utilFunctions.good b/test/library/packages/ConcurrentMap/memLeakTests/utilFunctions.good new file mode 100644 index 000000000000..e69de29bb2d1 diff --git a/test/library/packages/ConcurrentMap/testAddSet.future b/test/library/packages/ConcurrentMap/testAddSet.future deleted file mode 100644 index 8c8863fbae7a..000000000000 --- a/test/library/packages/ConcurrentMap/testAddSet.future +++ /dev/null @@ -1 +0,0 @@ -bug: this test leaks memory diff --git a/test/library/packages/ConcurrentMap/testClear.future b/test/library/packages/ConcurrentMap/testClear.future deleted file mode 100644 index 8c8863fbae7a..000000000000 --- a/test/library/packages/ConcurrentMap/testClear.future +++ /dev/null @@ -1 +0,0 @@ -bug: this test leaks memory diff --git a/test/library/packages/ConcurrentMap/testContains.future b/test/library/packages/ConcurrentMap/testContains.future deleted file mode 100644 index 8c8863fbae7a..000000000000 --- a/test/library/packages/ConcurrentMap/testContains.future +++ /dev/null @@ -1 +0,0 @@ -bug: this test leaks memory diff --git a/test/library/packages/ConcurrentMap/testEquality.future b/test/library/packages/ConcurrentMap/testEquality.future deleted file mode 100644 index 8c8863fbae7a..000000000000 --- a/test/library/packages/ConcurrentMap/testEquality.future +++ /dev/null @@ -1 +0,0 @@ -bug: this test leaks memory diff --git a/test/library/packages/ConcurrentMap/testExtend.future b/test/library/packages/ConcurrentMap/testExtend.future deleted file mode 100644 index 8c8863fbae7a..000000000000 --- a/test/library/packages/ConcurrentMap/testExtend.future +++ /dev/null @@ -1 +0,0 @@ -bug: this test leaks memory diff --git a/test/library/packages/ConcurrentMap/testGetRemove.future b/test/library/packages/ConcurrentMap/testGetRemove.future deleted file mode 100644 index 8c8863fbae7a..000000000000 --- a/test/library/packages/ConcurrentMap/testGetRemove.future +++ /dev/null @@ -1 +0,0 @@ -bug: this test leaks memory diff --git a/test/library/packages/LockFreeQueue/PREDIFF b/test/library/packages/LockFreeQueue/PREDIFF index 6515765f58cd..c280ebc44fa4 100755 --- a/test/library/packages/LockFreeQueue/PREDIFF +++ b/test/library/packages/LockFreeQueue/PREDIFF @@ -1,5 +1,4 @@ #!/bin/bash -sed -E "s/0x[0-9a-f]*/prediffed/" <$2 >$2.predifftmp -grep prediffed $2.predifftmp | uniq -c >$2 -rm $2.predifftmp +grep -v "\.chpl:.*" < $2 >$2.predifftmp +mv $2.predifftmp $2 diff --git a/test/library/packages/LockFreeQueue/memLeaks/README b/test/library/packages/LockFreeQueue/memLeaks/README new file mode 100644 index 000000000000..8fc534e52e71 --- /dev/null +++ b/test/library/packages/LockFreeQueue/memLeaks/README @@ -0,0 +1,3 @@ +This directory is locking down that we currently have a memory leak for this +module. These tests symlink to equivalent correctness tests and can be removed +once this leak is fixed. diff --git a/test/library/packages/LockFreeQueue/memLeaks/consistencyCheck.good b/test/library/packages/LockFreeQueue/memLeaks/consistencyCheck.good new file mode 100644 index 000000000000..8c1d835df5ab --- /dev/null +++ b/test/library/packages/LockFreeQueue/memLeaks/consistencyCheck.good @@ -0,0 +1,6 @@ + +================================================= Memory Leaks ================================================== +Allocated Memory (Bytes) Number Size Total Description Address +================================================================================================================= +================================================================================================================= + diff --git a/test/library/packages/LockFreeStack/PREDIFF b/test/library/packages/LockFreeStack/PREDIFF index 6515765f58cd..c280ebc44fa4 100755 --- a/test/library/packages/LockFreeStack/PREDIFF +++ b/test/library/packages/LockFreeStack/PREDIFF @@ -1,5 +1,4 @@ #!/bin/bash -sed -E "s/0x[0-9a-f]*/prediffed/" <$2 >$2.predifftmp -grep prediffed $2.predifftmp | uniq -c >$2 -rm $2.predifftmp +grep -v "\.chpl:.*" < $2 >$2.predifftmp +mv $2.predifftmp $2 diff --git a/test/library/packages/LockFreeStack/memLeaks/README b/test/library/packages/LockFreeStack/memLeaks/README new file mode 100644 index 000000000000..8fc534e52e71 --- /dev/null +++ b/test/library/packages/LockFreeStack/memLeaks/README @@ -0,0 +1,3 @@ +This directory is locking down that we currently have a memory leak for this +module. These tests symlink to equivalent correctness tests and can be removed +once this leak is fixed. diff --git a/test/library/packages/LockFreeStack/memLeaks/consistencyCheck.good b/test/library/packages/LockFreeStack/memLeaks/consistencyCheck.good new file mode 100644 index 000000000000..8c1d835df5ab --- /dev/null +++ b/test/library/packages/LockFreeStack/memLeaks/consistencyCheck.good @@ -0,0 +1,6 @@ + +================================================= Memory Leaks ================================================== +Allocated Memory (Bytes) Number Size Total Description Address +================================================================================================================= +================================================================================================================= +