commit d63069e732d357624a49743b8bb8e4f943d1380b
author Petteri Aimonen <jpa@git.mail.kapsi.fi> Sun Jan 19 21:32:43 2020 +0200
committer Petteri Aimonen <jpa@git.mail.kapsi.fi> Sun Jan 19 21:32:43 2020 +0200
tree 6a14f21753bc305e67eb207df2d5bc5983da8df2
parent dae4d5116844b5f3e3891ae4739b1d0218cd82aa

AVR tests: speed up testing, make heap size constant

tests/site_scons/platforms/avr/avr_io.c

diff --git a/tests/site_scons/platforms/avr/avr_io.c b/tests/site_scons/platforms/avr/avr_io.c
index 581a722..a994132 100644
--- a/tests/site_scons/platforms/avr/avr_io.c
+++ b/tests/site_scons/platforms/avr/avr_io.c
@@ -41,6 +41,8 @@
 
 FILE uart_str = FDEV_SETUP_STREAM(uart_putchar, uart_getchar, _FDEV_SETUP_RW);
 
+static char g_malloc_heap[8192];
+
 int main(void)
 {
     const char *argv[4] = {"main", g_args.args[0], g_args.args[1], g_args.args[2]};
@@ -49,8 +51,8 @@
     UBRR0 = (8000000 / (16UL * 9600)) - 1; /* 9600 bps with default 8 MHz clock */
     UCSR0B = _BV(TXEN0) | _BV(RXEN0);
     
-    /* This should be enough for the max stack usage in test cases */
-    __malloc_margin = 2048;
+    __malloc_heap_start = g_malloc_heap;
+    __malloc_heap_end = g_malloc_heap + sizeof(g_malloc_heap);
 
     stdout = stdin = stderr = &uart_str;
     

tests/site_scons/platforms/avr/run_test.c

diff --git a/tests/site_scons/platforms/avr/run_test.c b/tests/site_scons/platforms/avr/run_test.c
index 35cfa55..8e4679e 100644
--- a/tests/site_scons/platforms/avr/run_test.c
+++ b/tests/site_scons/platforms/avr/run_test.c
@@ -100,6 +100,7 @@
     uint32_t flags = 0;
     avr_ioctl(g_avr, AVR_IOCTL_UART_GET_FLAGS('0'), &flags);
     flags &= ~AVR_UART_FLAG_STDIO;
+    flags &= ~AVR_UART_FLAG_POLL_SLEEP;
     avr_ioctl(g_avr, AVR_IOCTL_UART_SET_FLAGS('0'), &flags);
 
     avr_irq_t *src = avr_io_getirq(g_avr, AVR_IOCTL_UART_GETIRQ('0'), UART_IRQ_OUTPUT);