diff options
| author | Rickard Green <[email protected]> | 2016-01-22 11:11:40 +0100 |
|---|---|---|
| committer | Rickard Green <[email protected]> | 2016-01-22 11:11:40 +0100 |
| commit | 044f9b79cf705add905284d93010f40088c0f3bc (patch) | |
| tree | 38e09d61a575c4e280e0a99ca964bb50a6221751 /erts/test | |
| parent | 0b9852d9a774be8c6f1d91065b60329bac779e2f (diff) | |
| parent | 3d99247859e1d5d1862b550cd29c44a4f4cf54e0 (diff) | |
| download | otp-044f9b79cf705add905284d93010f40088c0f3bc.tar.gz otp-044f9b79cf705add905284d93010f40088c0f3bc.tar.bz2 otp-044f9b79cf705add905284d93010f40088c0f3bc.zip | |
Merge branch 'maint'
* maint:
Fix HL timer hard debug implementation
Fix stack alignment problem in ethread test on arm
Skip time_SUITE:timestamp on timewarp test
Diffstat (limited to 'erts/test')
| -rw-r--r-- | erts/test/ethread_SUITE_data/ethread_tests.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/erts/test/ethread_SUITE_data/ethread_tests.c b/erts/test/ethread_SUITE_data/ethread_tests.c index 12f7f3db7a..b51771c736 100644 --- a/erts/test/ethread_SUITE_data/ethread_tests.c +++ b/erts/test/ethread_SUITE_data/ethread_tests.c @@ -1457,6 +1457,9 @@ do { \ ASSERT(ethr_ ## A ## _read ## B(&A) == 0x33333333); \ } while (0) +ethr_atomic32_t atomic32; +ethr_atomic_t atomic; +ethr_dw_atomic_t dw_atomic; static void atomic_basic_test(void) @@ -1465,8 +1468,6 @@ atomic_basic_test(void) * Verify that each op does what it is expected * to do for at least one input. */ - ethr_atomic32_t atomic32; - ethr_atomic_t atomic; print_line("AT_AINT32_MAX=%d",AT_AINT32_MAX); print_line("AT_AINT32_MIN=%d",AT_AINT32_MIN); @@ -1629,7 +1630,6 @@ atomic_basic_test(void) /* Double word */ { - ethr_dw_atomic_t dw_atomic; ethr_dw_sint_t dw0, dw1; dw0.sint[0] = 4711; dw0.sint[1] = 4712; |