X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftest-framework%2Ftimothy_tests%2Fhandle_tests%2FMakefile;fp=direct%2Ftest-framework%2Ftimothy_tests%2Fhandle_tests%2FMakefile;h=17345e197c6ac5ce2dc0d5bb5c560e887656db4e;hp=a2e9a5ecc328334fd8bb2d386cc779d6392c01fa;hb=18a85b88ac3ad344bbc8f2530c84e2a621d901c4;hpb=0459b0b3f858ef3e840b93d723a3b2cad862d95f

diff --git a/direct/test-framework/timothy_tests/handle_tests/Makefile b/direct/test-framework/timothy_tests/handle_tests/Makefile
index a2e9a5e..17345e1 100644
--- a/direct/test-framework/timothy_tests/handle_tests/Makefile
+++ b/direct/test-framework/timothy_tests/handle_tests/Makefile
@@ -1,4 +1,4 @@
-# Makefile for YAFFS direct stress tests
+# Makefile for stress tests and fuzzer
 #
 #
 # YAFFS: Yet another Flash File System. A NAND-flash specific file system.
@@ -14,102 +14,30 @@
 #
 # NB Warning this Makefile does not include header dependencies.
 #
-# $Id: Makefile,v 1.7 2010-02-25 22:34:47 charles Exp $
 
-#EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
-
-CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_YAFFS2  
-CFLAGS +=     -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
-CFLAGS +=    -Wall -g $(EXTRA_COMPILE_FLAGS) -Wstrict-aliasing 
-#CFLAGS +=    -fno-strict-aliasing
-CFLAGS +=    -O0
-CFLAGS +=    -Wextra -Wpointer-arith
-#CFLAGS +=    -DCONFIG_YAFFS_VALGRIND_TEST
-
-#CFLAGS+=   -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
-#CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
-
-
-COMMONTESTOBJS = yaffscfg2k.o yaffs_osglue.o yaffs_hweight.o \
-		 yaffs_ecc.o yaffs_fileem.o yaffs_fileem2k.o yaffsfs.o yaffs_guts.o \
-		 yaffs_packedtags1.o yaffs_ramdisk.o yaffs_ramem2k.o \
-		 yaffs_tagscompat.o yaffs_packedtags2.o yaffs_nand.o \
-		 yaffs_checkptrw.o  yaffs_qsort.o\
-		 yaffs_nameval.o yaffs_attribs.o \
-		 yaffs_norif1.o  ynorsim.o  \
-		 yaffs_allocator.o \
-		 yaffs_bitmap.o \
-		 yaffs_yaffs1.o \
-		 yaffs_yaffs2.o \
-		 yaffs_verify.o \
-		 yaffs_error.o	\
-		 yaffs_summary.o
-
-#		 yaffs_checkptrwtest.o\
+YDI_DIR = ../../../
+YDI_FRAMEWORK_DIR = ../../
+CLEAN_OBJS = handle_test emfile-2k-0
 
 TESTFILES = 	handle_test.o 
 
 
-		  
-
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) $(TESTFILES)
-
-
-ALLOBJS = $(sort $(YAFFSTESTOBJS)) $(PYTHONOBJS)
-
-YAFFSSYMLINKS = yaffs_ecc.c yaffs_ecc.h yaffs_guts.c yaffs_guts.h yaffs_tagscompat.c yaffs_tagscompat.h \
-          yaffs_packedtags1.c yaffs_packedtags1.h yaffs_packedtags2.c yaffs_packedtags2.h \
-          yaffs_nand.c yaffs_nand.h yaffs_getblockinfo.h \
-          yaffs_checkptrw.h yaffs_checkptrw.c \
-          yaffs_nameval.c yaffs_nameval.h \
-          yaffs_trace.h yaffs_attribs.h \
-          yaffs_allocator.c yaffs_allocator.h \
-          yaffs_yaffs1.c yaffs_yaffs1.h \
-          yaffs_yaffs2.c yaffs_yaffs2.h \
-          yaffs_bitmap.c yaffs_bitmap.h \
-          yaffs_verify.c yaffs_verify.h \
-		  yaffs_summary.c yaffs_summary.h
-
-YAFFSDIRECTSYMLINKS =  yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
-		       yaffsfs.h ydirectenv.h \
-		       yaffs_flashif.c yaffscfg.h yaffs_qsort.c \
-		       yaffs_nandemul2k.h yaffs_list.h \
-		       yaffs_attribs.c yaffs_osglue.h \
-		       yaffs_nandif.c yaffs_nandif.h yportenv.h \
-		       yaffs_hweight.h yaffs_hweight.c \
-		       yaffs_error.c
-
-
-DIRECTEXTRASYMLINKS = 	yaffscfg2k.c yaffs_fileem2k.c yaffs_fileem2k.h\
-			yaffs_fileem.c yaffs_norif1.c yaffs_norif1.h \
-			yaffs_ramdisk.c yaffs_ramdisk.h yaffs_ramem2k.c \
-			ynorsim.h ynorsim.c yaffs_osglue.c
-
-SYMLINKS = $(YAFFSSYMLINKS) $(YAFFSDIRECTSYMLINKS) $(DIRECTEXTRASYMLINKS) $(PYTONOSYMLINKS)
-#all: directtest2k boottest
 
 all: handle_test
 
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -o $@ $<
+YAFFS_TEST_OBJS = $(COMMONTESTOBJS) $(TESTFILES)
 
-$(PYTONOSYMLINKS):
-	ln -s ../../python/$@ $@
 
-$(YAFFSSYMLINKS):
-	ln -s ../../../$@ $@
+ALL_UNSORTED_OBJS += $(YAFFS_TEST_OBJS) $(FUZZER_OBJS)
 
-$(YAFFSDIRECTSYMLINKS):
-	ln -s ../../$@ $@
+include $(YDI_FRAMEWORK_DIR)/FrameworkRules.mk
 
-$(DIRECTEXTRASYMLINKS):
-	ln -s ../../basic-test/$@ $@
 
+yaffs_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
 
-handle_test: $(SYMLINKS) $(ALLOBJS)
-	gcc $(CFLLAG) -o $@ $(ALLOBJS)
 
 
+handle_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
 
-clean:
-	rm -f handle_test  $(ALLOBJS) core $(SYMLINKS)