regress/Makefile conflict resolution

This commit is contained in:
Chris Eagle
2015-08-26 21:38:24 -07:00
3 changed files with 482 additions and 1 deletions

5
regress/Makefile Normal file → Executable file
View File

@@ -1,7 +1,10 @@
CFLAGS += -I../include
LDFLAGS = -L.. -lunicorn
TESTS = map_crash sigill sigill2 block_test ro_mem_test
TESTS = map_crash map_write
TESTS += sigill sigill2
TESTS += block_test
TESTS += ro_mem_test
all: $(TESTS)