9os

commit 878bb6f91aa29c9e50905df35713e45ecdb198a9
parent 44e630924fba5d9c3e5c71bc27a8fd2f6479b75e
Author: Roberto Vargas <roberto.vargas@arm.com>
Date:   Wed, 21 Nov 2018 14:09:05 +0000

[rules.mk] Remove non generic rules

Change-Id: I40778bf58389feed7db63e1552f80a3762dd3170

Diffstat:
M
scripts/rules.mk
 | 
9
---------
M
test/unit/001/Makefile
 | 
1
+
M
test/unit/002/Makefile
 | 
1
+
M
test/unit/003/Makefile
 | 
1
+
M
test/unit/004/Makefile
 | 
1
+
A
test/unit/rules.mk
 | 
2
++

6 files changed, 6 insertions(+), 9 deletions(-)
diff --git a/scripts/rules.mk b/scripts/rules.mk
@@ -31,9 +31,6 @@ RCODE_ASFLAGS = $(MOREASFLAGS) \
                 $(SYSASFLAGS) \
                 $(ASFLAGS)
 
-CBMC_FLAGS = $(CFLAGS) --bounds-check --object-bits 16
-CBMC_PATHS = arch/$(ARCH)/*.c src/libc/arch/$(ARCH)/*.c src/*/*.c
-
 EMUCMD     = $(EMU) $(EMUFLAGS)
 
 CC = $(CROSS_COMPILE)$(COMP)
@@ -82,12 +79,6 @@ all:
 
 FORCE:
 
-cbmc: all FORCE
-	cbmc $(INCLUDES) $(CBMC_FLAGS) $(CBMC_PATHS)
-
-run_test: run FORCE
-	EMUCMD='$(EMUCMD)' SCRIPTDIR=$(SCRIPTDIR) ./test.sh
-
 clean: clean-files
 
 clean-files:
diff --git a/test/unit/001/Makefile b/test/unit/001/Makefile
@@ -1,6 +1,7 @@
 .POSIX:
 PROJECTDIR = ../../..
 include $(PROJECTDIR)/scripts/rules.mk
+include ../rules.mk
 
 LIBOBJ = hdl_RMU_System_InterfaceVersion.o \
          hdl_RMU_System_Status.o \
diff --git a/test/unit/002/Makefile b/test/unit/002/Makefile
@@ -1,6 +1,7 @@
 .POSIX:
 PROJECTDIR = ../../..
 include $(PROJECTDIR)/scripts/rules.mk
+include ../rules.mk
 
 OBJS   = $(ARCHDIR)/crt-$(SYS).o test.o
 LIBS   = -ltypes -lc
diff --git a/test/unit/003/Makefile b/test/unit/003/Makefile
@@ -1,6 +1,7 @@
 .POSIX:
 PROJECTDIR = ../../..
 include $(PROJECTDIR)/scripts/rules.mk
+include ../rules.mk
 
 OBJS   = $(ARCHDIR)/crt-$(SYS).o $(SRCDIR)/romfw/builtin.o test.o
 LIBS   = -lhdl -lrmu -lk -lc
diff --git a/test/unit/004/Makefile b/test/unit/004/Makefile
@@ -1,6 +1,7 @@
 .POSIX:
 PROJECTDIR = ../../..
 include $(PROJECTDIR)/scripts/rules.mk
+include ../rules.mk
 
 OBJS   = $(ARCHDIR)/crt-$(SYS).o $(SRCDIR)/romfw/builtin.o test.o
 LIBS   = -lhdl -lrmu -lk -lc
diff --git a/test/unit/rules.mk b/test/unit/rules.mk
@@ -0,0 +1,2 @@
+run_test: run FORCE
+	EMUCMD='$(EMUCMD)' SCRIPTDIR=$(SCRIPTDIR) ./test.sh