diff options
author | ringabout <43030857+ringabout@users.noreply.github.com> | 2022-11-17 09:38:07 +0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-11-17 09:38:07 +0800 |
commit | cdbf5b469949366d56f1eb2dbc7721eaf0cbc218 (patch) | |
tree | 7a73a399695c3de40cd1e46d74e149aa1975f618 | |
parent | e03a178bff6beebd7aec134f62ad4b9914892b4d (diff) | |
download | Nim-cdbf5b469949366d56f1eb2dbc7721eaf0cbc218.tar.gz |
fixes a severe bug of testament (#20832)
* test azure * use exit 1 * try again * use useSysAssert * disable i386 * use refc for tlsEmulation on i386 * use refc * disable i386 Co-authored-by: Clay Sweetser <Varriount@users.noreply.github.com>
-rw-r--r-- | lib/system/alloc.nim | 1 | ||||
-rw-r--r-- | testament/testament.nim | 1 | ||||
-rw-r--r-- | tests/destructor/topttree.nim | 1 | ||||
-rw-r--r-- | tests/misc/ttlsemulation.nim | 1 | ||||
-rw-r--r-- | tests/threads/t7172.nim | 1 | ||||
-rw-r--r-- | tests/threads/t8535.nim | 1 | ||||
-rw-r--r-- | tests/threads/threadex.nim | 1 | ||||
-rw-r--r-- | tests/threads/tjsthreads.nim | 2 | ||||
-rw-r--r-- | tests/threads/tmanyjoin.nim | 1 | ||||
-rw-r--r-- | tests/threads/tonthreadcreation.nim | 1 | ||||
-rw-r--r-- | tests/threads/tracy_allocator.nim | 1 | ||||
-rw-r--r-- | tests/threads/treusetvar.nim | 1 | ||||
-rw-r--r-- | tests/threads/tthreadvars.nim | 1 |
13 files changed, 13 insertions, 1 deletions
diff --git a/lib/system/alloc.nim b/lib/system/alloc.nim index 5350c1db8..a99769725 100644 --- a/lib/system/alloc.nim +++ b/lib/system/alloc.nim @@ -900,6 +900,7 @@ proc rawDealloc(a: var MemRegion, p: pointer) = #sysAssert(isAllocatedPtr(a, p), "rawDealloc: no allocated pointer") sysAssert(allocInv(a), "rawDealloc: begin") var c = pageAddr(p) + sysAssert(c != nil, "rawDealloc: begin") if isSmallChunk(c): # `p` is within a small chunk: var c = cast[PSmallChunk](c) diff --git a/testament/testament.nim b/testament/testament.nim index 786857856..ac99a2373 100644 --- a/testament/testament.nim +++ b/testament/testament.nim @@ -507,6 +507,7 @@ proc testSpecHelper(r: var TResults, test: var TTest, expected: TSpec, else: buf if exitCode != expected.exitCode: + given.err = reExitcodesDiffer r.addResult(test, target, extraOptions, "exitcode: " & $expected.exitCode, "exitcode: " & $exitCode & "\n\nOutput:\n" & bufB, reExitcodesDiffer) diff --git a/tests/destructor/topttree.nim b/tests/destructor/topttree.nim index fa5495689..8cf757e8b 100644 --- a/tests/destructor/topttree.nim +++ b/tests/destructor/topttree.nim @@ -1,4 +1,5 @@ discard """ + disabled: i386 output: '''10.0 60.0 90.0 diff --git a/tests/misc/ttlsemulation.nim b/tests/misc/ttlsemulation.nim index 47c5934e6..767a9bd4e 100644 --- a/tests/misc/ttlsemulation.nim +++ b/tests/misc/ttlsemulation.nim @@ -1,4 +1,5 @@ discard """ + disabled: i386 matrix: "-d:nimTtlsemulationCase1 --threads --tlsEmulation:on; -d:nimTtlsemulationCase2 --threads --tlsEmulation:off; -d:nimTtlsemulationCase3 --threads" targets: "c cpp" """ diff --git a/tests/threads/t7172.nim b/tests/threads/t7172.nim index 8dcca74a3..87e89417b 100644 --- a/tests/threads/t7172.nim +++ b/tests/threads/t7172.nim @@ -1,4 +1,5 @@ discard """ + disabled: i386 output: ''' In doStuff() In initProcess() diff --git a/tests/threads/t8535.nim b/tests/threads/t8535.nim index 1af11f9ad..a4296df11 100644 --- a/tests/threads/t8535.nim +++ b/tests/threads/t8535.nim @@ -1,4 +1,5 @@ discard """ + disabled: i386 output: '''0 hello''' """ diff --git a/tests/threads/threadex.nim b/tests/threads/threadex.nim index 50a1a4d34..90119aee7 100644 --- a/tests/threads/threadex.nim +++ b/tests/threads/threadex.nim @@ -1,4 +1,5 @@ discard """ + disabled: i386 outputsub: "Just a simple text for test" """ diff --git a/tests/threads/tjsthreads.nim b/tests/threads/tjsthreads.nim index 2a8ff60fb..5122c9cd6 100644 --- a/tests/threads/tjsthreads.nim +++ b/tests/threads/tjsthreads.nim @@ -1,5 +1,5 @@ discard """ - targets: "c cpp js" + targets: "js" matrix: "--threads:on" """ diff --git a/tests/threads/tmanyjoin.nim b/tests/threads/tmanyjoin.nim index aca284965..af5bc460e 100644 --- a/tests/threads/tmanyjoin.nim +++ b/tests/threads/tmanyjoin.nim @@ -1,4 +1,5 @@ discard """ + disabled: i386 outputsub: "129" """ diff --git a/tests/threads/tonthreadcreation.nim b/tests/threads/tonthreadcreation.nim index 0652d79f8..61529477d 100644 --- a/tests/threads/tonthreadcreation.nim +++ b/tests/threads/tonthreadcreation.nim @@ -1,4 +1,5 @@ discard """ + disabled: i386 matrix: "--mm:refc; --mm:orc --deepcopy:on" output: '''some string here dying some string here''' diff --git a/tests/threads/tracy_allocator.nim b/tests/threads/tracy_allocator.nim index e8f0ec927..f3b39f4dc 100644 --- a/tests/threads/tracy_allocator.nim +++ b/tests/threads/tracy_allocator.nim @@ -1,4 +1,5 @@ discard """ + disabled: i386 output: '''true''' """ diff --git a/tests/threads/treusetvar.nim b/tests/threads/treusetvar.nim index 2b0017595..f0337801a 100644 --- a/tests/threads/treusetvar.nim +++ b/tests/threads/treusetvar.nim @@ -1,4 +1,5 @@ discard """ + disabled: i386 outputsub: "65" """ diff --git a/tests/threads/tthreadvars.nim b/tests/threads/tthreadvars.nim index 81aa2e5ec..745e3562c 100644 --- a/tests/threads/tthreadvars.nim +++ b/tests/threads/tthreadvars.nim @@ -1,4 +1,5 @@ discard """ +disabled: i386 output: ''' 10 1111 |