X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=blobdiff_plain;f=direct%2Ftest-framework%2Ftimothy_tests%2Fquick_tests%2FMakefile;fp=direct%2Ftimothy_tests%2Fquick_tests%2FMakefile;h=496e2bea019a9769f9b2dbe7c517a4c52c0ed9d7;hp=210857bfd64fcb1179ca1c64c6038d379dd8873b;hb=e5daa72b0083831ab762a650860687fe7d25d6b3;hpb=a78bce6f4a7042fa153ab32d2bb263ecf7d27b66

diff --git a/direct/timothy_tests/quick_tests/Makefile b/direct/test-framework/timothy_tests/quick_tests/Makefile
similarity index 67%
rename from direct/timothy_tests/quick_tests/Makefile
rename to direct/test-framework/timothy_tests/quick_tests/Makefile
index 210857b..496e2be 100644
--- a/direct/timothy_tests/quick_tests/Makefile
+++ b/direct/test-framework/timothy_tests/quick_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,38 +14,11 @@
 #
 # 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  -DCONFIG_YAFFS_DEFINES_TYPES
-
-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
+YDI_DIR = ../../../
+YDI_FRAMEWORK_DIR = ../../
 
+TARGETS = yaffs_test fuzzer
 TESTFILES = 	quick_tests.o lib.o \
 		test_yaffs_mount.o test_yaffs_mount_ENODEV.o test_yaffs_mount_ENAMETOOLONG.o test_yaffs_mount_EBUSY.o \
 		test_yaffs_mount_NULL.o \
@@ -111,71 +84,22 @@ TESTFILES = 	quick_tests.o lib.o \
 		test_yaffs_dup.o test_yaffs_dup_EBADF.o 
 
 
+all: $(TARGETS)
 
-		  
-
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) $(TESTFILES)
-
-ALLOBJS = $(sort $(YAFFSTESTOBJS))
-
-YAFFSDIRECTSYMLINKS =  \
-          yaffsfs.c yaffs_flashif.h yaffs_flashif2.h\
-          yaffsfs.h yaffs_osglue.h ydirectenv.h \
-          yaffs_flashif.c yaffscfg.h yaffs_qsort.c \
-          yaffs_nandemul2k.h yaffs_list.h \
-          yaffs_attribs.c \
-          yaffs_error.c \
-          yaffs_nandif.c yaffs_nandif.h yportenv.h \
-          yaffs_hweight.c yaffs_hweight.h \
-          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
-
-
-
-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: quick_tests 
-
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -o $@ $<
-
-$(PYTONOSYMLINKS):
-	ln -s ../../python/$@ $@
-
-
-
-$(YAFFSDIRECTSYMLINKS):
-	ln -s ../../$@ $@
+YAFFS_TEST_OBJS = $(COMMONTESTOBJS) $(TESTFILES)
+FUZZER_OBJS = fuzzer.o
 
-$(DIRECTEXTRASYMLINKS):
-	ln -s ../../basic-test/$@ $@
+ALL_UNSORTED_OBJS += $(YAFFS_TEST_OBJS) $(FUZZER_OBJS)
 
+include $(YDI_FRAMEWORK_DIR)/FrameworkRules.mk
 
-quick_tests: $(SYMLINKS) $(ALLOBJS)
-	gcc $(CFLLAG) -o $@ $(ALLOBJS)
 
+yaffs_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLLAG) -o $@ $(YAFFS_TEST_OBJS)
 
 
 
 
+quick_tests: $(TESTFILES)
+	gcc $(CFLAG) -o $@ $(TESTFILES)
 
-clean:
-	rm -f quick_tests  $(ALLOBJS) core $(SYMLINKS)