9os

commit 88ab3157d064761d1b4fc52d581091437f36a324
parent 878bb6f91aa29c9e50905df35713e45ecdb198a9
Author: Dimitris Papastamos <dimitris.papastamos@arm.com>
Date:   Wed, 21 Nov 2018 14:14:33 +0000

Fix unit tests

Change-Id: Ia4e89cde92b29379d65a96899cfecc87ba2a77ce
Signed-off-by: Dimitris Papastamos <dimitris.papastamos@arm.com>

Diffstat:
M
test/unit/001/Makefile
 | 
12
++++++++++--
M
test/unit/003/Makefile
 | 
6
+++++-
M
test/unit/003/test.c
 | 
3
+++
M
test/unit/004/Makefile
 | 
6
+++++-

4 files changed, 23 insertions(+), 4 deletions(-)
diff --git a/test/unit/001/Makefile b/test/unit/001/Makefile
@@ -72,8 +72,16 @@ LIBOBJ = hdl_RMU_System_InterfaceVersion.o \
          hdl_RMU_Granule_ImportInit.o \
          hdl_RMU_Granule_Import.o \
 
-ROMOBJS = $(ARCHDIR)/crt-$(SYS).o $(SRCDIR)/romfw/builtin.o test.o
-RAMOBJS = $(ARCHDIR)/crt-$(SYS).o $(SRCDIR)/ramfw/builtin.o test.o
+ROMOBJS = $(ARCHDIR)/crt-$(SYS).o \
+          $(ARCHDIR)/bss.o \
+          $(SRCDIR)/romfw/builtin.o \
+          test.o \
+
+RAMOBJS = $(ARCHDIR)/crt-$(SYS).o \
+          $(ARCHDIR)/bss.o \
+          $(SRCDIR)/ramfw/builtin.o \
+          test.o \
+
 LIBS    = -lhdl -lk -lc
 LIBDEP  = libhdl.a $(LIBDIR)/libk.a $(LIBDIR)/libc.a
 
diff --git a/test/unit/003/Makefile b/test/unit/003/Makefile
@@ -3,7 +3,11 @@ PROJECTDIR = ../../..
 include $(PROJECTDIR)/scripts/rules.mk
 include ../rules.mk
 
-OBJS   = $(ARCHDIR)/crt-$(SYS).o $(SRCDIR)/romfw/builtin.o test.o
+OBJS   = $(ARCHDIR)/crt-$(SYS).o \
+         $(ARCHDIR)/bss.o \
+         $(SRCDIR)/romfw/builtin.o \
+         test.o \
+
 LIBS   = -lhdl -lrmu -lk -lc
 
 LIBDEP = $(LIBDIR)/libhdl.a \
diff --git a/test/unit/003/test.c b/test/unit/003/test.c
@@ -2,8 +2,11 @@
 #include <setjmp.h>
 #include <stdio.h>
 #include <stdlib.h>
+
 #include <rcode.h>
 
+#include "../../../src/ec.h"
+
 jmp_buf env;
 
 int
diff --git a/test/unit/004/Makefile b/test/unit/004/Makefile
@@ -3,7 +3,11 @@ PROJECTDIR = ../../..
 include $(PROJECTDIR)/scripts/rules.mk
 include ../rules.mk
 
-OBJS   = $(ARCHDIR)/crt-$(SYS).o $(SRCDIR)/romfw/builtin.o test.o
+OBJS   = $(ARCHDIR)/crt-$(SYS).o \
+         $(ARCHDIR)/bss.o \
+         $(SRCDIR)/romfw/builtin.o \
+         test.o \
+
 LIBS   = -lhdl -lrmu -lk -lc
 
 LIBDEP = $(LIBDIR)/libhdl.a \