aboutsummaryrefslogtreecommitdiffstats
path: root/erts/test
diff options
context:
space:
mode:
authorRickard Green <[email protected]>2016-01-22 11:11:06 +0100
committerRickard Green <[email protected]>2016-01-22 11:11:06 +0100
commit3d99247859e1d5d1862b550cd29c44a4f4cf54e0 (patch)
treecef0b01d8cb82f5ebbbf5d206f1d8ad0feded238 /erts/test
parent59d6e191aea477fdbbf2befa47ae1f612ed6ab17 (diff)
parent9293a250e02e63d295a841786f03c3e3a3f30e97 (diff)
downloadotp-3d99247859e1d5d1862b550cd29c44a4f4cf54e0.tar.gz
otp-3d99247859e1d5d1862b550cd29c44a4f4cf54e0.tar.bz2
otp-3d99247859e1d5d1862b550cd29c44a4f4cf54e0.zip
Merge branch 'rickard/test-fix' into maint
* rickard/test-fix: 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.c6
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;