From: Timothy Manning <tfhmanning@gmail.com>
Date: Wed, 14 Nov 2012 21:21:02 +0000 (+1300)
Subject: yaffs all timothy_tests makefiles are working. threading test is broken.
X-Git-Tag: aleph1-release~62^2~7
X-Git-Url: http://www.aleph1.co.uk/gitweb/?p=yaffs2.git;a=commitdiff_plain;h=18a85b88ac3ad344bbc8f2530c84e2a621d901c4

yaffs all timothy_tests makefiles are working. threading test is broken.
Signed-off-by: Timothy Manning <tfhmanning@gmail.com>
---

diff --git a/direct/test-framework/FrameworkRules.mk b/direct/test-framework/FrameworkRules.mk
index 52aaf3c..4532aa8 100644
--- a/direct/test-framework/FrameworkRules.mk
+++ b/direct/test-framework/FrameworkRules.mk
@@ -84,7 +84,7 @@ FRAMEWORKEXTRASYMLINKS = \
 FRAMEWORK_SOURCES = $(YAFFSDIRECTSYMLINKS) $(FRAMEWORKEXTRASYMLINKS)
 
 clean:
-	rm -f $(TARGETS) $(ALLOBJS) core $(FRAMEWORK_SOURCES) yaffs_test
+	rm -f $(TARGETS) $(ALLOBJS) core $(FRAMEWORK_SOURCES) $(CLEAN_OBJS)
 
 $(YAFFSDIRECTSYMLINKS):
 	ln -s $(YDI_DIR)/$@ $@
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) 
diff --git a/direct/test-framework/timothy_tests/is_yaffs_working_tests/Makefile b/direct/test-framework/timothy_tests/is_yaffs_working_tests/Makefile
index 8cc1f44..8e111ac 100644
--- a/direct/test-framework/timothy_tests/is_yaffs_working_tests/Makefile
+++ b/direct/test-framework/timothy_tests/is_yaffs_working_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,28 @@
 #
 # 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
+YDI_DIR = ../../../
+YDI_FRAMEWORK_DIR = ../../
 
-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\
-
-TESTFILES = 	test_1_yaffs_mount.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
+CLEAN_OBJS = test_1_yaffs_mount emfile-2k-0
+TESTFILES = 	test_1_yaffs_mount.o  
 
 all: test_1_yaffs_mount
 
-$(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)
 
-test_1_yaffs_mount: $(SYMLINKS) $(ALLOBJS)
-	gcc $(CFLLAG) -o $@ $(ALLOBJS)
 
 
+test_1_yaffs_mount: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
 
-clean:
-	rm -f test_1_yaffs_mount  $(ALLOBJS) core $(SYMLINKS) 
diff --git a/direct/test-framework/timothy_tests/linux_tests/Makefile b/direct/test-framework/timothy_tests/linux_tests/Makefile
index c80ef4d..10442f5 100644
--- a/direct/test-framework/timothy_tests/linux_tests/Makefile
+++ b/direct/test-framework/timothy_tests/linux_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,103 +14,28 @@
 #
 # 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
+YDI_DIR = ../../../
+YDI_FRAMEWORK_DIR = ../../
+CLEAN_OBJS = linux_test emfile-2k-0
 
-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_tagsvalidity.o
-#		 yaffs_checkptrwtest.o\
-
-TESTFILES = 	linux_test.o lib.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
-#yaffs_tagsvalidity.c yaffs_tagsvalidity.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
+TESTFILES = 	linux_test.o lib.o 
 
 all: linux_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)
 
-linux_test: $(SYMLINKS) $(ALLOBJS)
-	gcc $(CFLLAG) -o $@ $(ALLOBJS)
 
 
+linux_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
 
-clean:
-	rm -f linux_test  $(ALLOBJS) core $(SYMLINKS) 
diff --git a/direct/test-framework/timothy_tests/quick_tests/Makefile b/direct/test-framework/timothy_tests/quick_tests/Makefile
index 27dfdc0..c37d916 100644
--- a/direct/test-framework/timothy_tests/quick_tests/Makefile
+++ b/direct/test-framework/timothy_tests/quick_tests/Makefile
@@ -17,7 +17,7 @@
 
 YDI_DIR = ../../../
 YDI_FRAMEWORK_DIR = ../../
-
+CLEAN_OBJS = quick_tests emfile-2k-0
 
 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 \
diff --git a/direct/test-framework/timothy_tests/stress_tester/Makefile b/direct/test-framework/timothy_tests/stress_tester/Makefile
index b6d8cf8..954df4f 100644
--- a/direct/test-framework/timothy_tests/stress_tester/Makefile
+++ b/direct/test-framework/timothy_tests/stress_tester/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,109 +14,28 @@
 #
 # 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
+YDI_DIR = ../../../
+YDI_FRAMEWORK_DIR = ../../
+CLEAN_OBJS = yaffs_tester emfile-2k-0
 
-CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_SHORT_NAMES_IN_RAM -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
+TESTFILES = 	yaffs_tester.o message_buffer.o error_handler.o 
 
-#CFLAGS+=   -Wshadow -Wpointer-arith -Wwrite-strings -Wstrict-prototypes -Wmissing-declarations
-#CFLAGS+=   -Wmissing-prototypes -Wredundant-decls -Wnested-externs -Winline
+all: yaffs_tester
 
-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_summary.o
+YAFFS_TEST_OBJS = $(COMMONTESTOBJS) $(TESTFILES)
 
 
-SSCOMMONTESTOBJS = yaffscfg2k.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_attribs.o yaffs_allocator.o \
-		 yaffs_checkptrw.o  yaffs_qsort.o\
-		 yaffs_nameval.o \
-		 yaffs_norif1.o  ynorsim.o   \
-		 yaffs_allocator.o \
-		 yaffs_bitmap.o \
-		 yaffs_yaffs1.o \
-		 yaffs_yaffs2.o \
-		 yaffs_verify.o
+ALL_UNSORTED_OBJS += $(YAFFS_TEST_OBJS) $(FUZZER_OBJS)
 
-#		 yaffs_checkptrwtest.o\
+include $(YDI_FRAMEWORK_DIR)/FrameworkRules.mk
 
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) yaffs_tester.o message_buffer.o error_handler.o
 
+yaffs_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
 
-ALLOBJS = $(sort $(YAFFSTESTOBJS))
 
-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 yaffs_osglue.h ydirectenv.h \
-		       yaffs_flashif.c yaffscfg.h yaffs_qsort.c \
-		       yaffs_nandemul2k.h yaffs_list.h \
-		       yaffs_attribs.c \
-		       yaffs_nandif.c yaffs_nandif.h yportenv.h \
-		       yaffs_hweight.c yaffs_hweight.h
+yaffs_tester: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
 
-
-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)
-#all: directtest2k boottest
-
-all: yaffs_tester 
-
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -o $@ $<
-
-
-$(YAFFSSYMLINKS):
-	ln -s ../../../$@ $@
-
-$(YAFFSDIRECTSYMLINKS):
-	ln -s ../../$@ $@
-
-$(DIRECTEXTRASYMLINKS):
-	ln -s ../../basic-test/$@ $@
-
-
-yaffs_tester: $(SYMLINKS) $(YAFFSTESTOBJS)
-	gcc $(CFLLAG) -o $@ $(YAFFSTESTOBJS)
-
-
-
-
-
-
-clean:
-	rm -f yaffs_tester  $(ALLOBJS) core $(SYMLINKS) log.txt 
diff --git a/direct/test-framework/timothy_tests/threading/Makefile b/direct/test-framework/timothy_tests/threading/Makefile
index cb3c1e4..7d0a408 100644
--- a/direct/test-framework/timothy_tests/threading/Makefile
+++ b/direct/test-framework/timothy_tests/threading/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,104 +14,29 @@
 #
 # 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 = threading emfile-2k-0
 
 TESTFILES = 	threading.o thread_function.o \
 		test_a.o test_b.o lib.o
 
-		  
-
-YAFFSTESTOBJS  = $(COMMONTESTOBJS) $(TESTFILES)
-
-ALLOBJS = $(sort $(YAFFSTESTOBJS))
-
-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: threading
 
-$(ALLOBJS): %.o: %.c
-	gcc -c $(CFLAGS) -o $@ $<
-
-$(PYTONOSYMLINKS):
-	ln -s ../../python/$@ $@
-
-$(YAFFSSYMLINKS):
-	ln -s ../../../$@ $@
-
-$(YAFFSDIRECTSYMLINKS):
-	ln -s ../../$@ $@
+YAFFS_TEST_OBJS = $(COMMONTESTOBJS) $(TESTFILES)
 
-$(DIRECTEXTRASYMLINKS):
-	ln -s ../../basic-test/$@ $@
 
+ALL_UNSORTED_OBJS += $(YAFFS_TEST_OBJS) $(FUZZER_OBJS)
 
-threading: $(SYMLINKS) $(ALLOBJS)
-	gcc $(CFLLAG) -o $@ $(ALLOBJS) -lpthread
+include $(YDI_FRAMEWORK_DIR)/FrameworkRules.mk
 
 
+yaffs_test: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
 
 
 
+threading: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS) -pthread
 
-clean:
-	rm -f  threading $(ALLOBJS) core $(SYMLINKS) 
diff --git a/direct/test-framework/timothy_tests/threading/threading.c b/direct/test-framework/timothy_tests/threading/threading.c
index 96a91f8..7ac4e2e 100644
--- a/direct/test-framework/timothy_tests/threading/threading.c
+++ b/direct/test-framework/timothy_tests/threading/threading.c
@@ -12,7 +12,6 @@
  */
 
 #include "threading.h"
-
 int random_seed;
 int simulate_power_failure = 0;
 
@@ -61,7 +60,7 @@ int main(int argc, char *argv[])
 	for (x=0;x<get_num_of_threads();x++)
 	{
 		
-		output=pthread_create(&threads[x], NULL,thread_function, (void *)x );
+		output = pthread_create(&threads[x], NULL,thread_function, (void *)x );
 		if (output>0){
 			printf("failed to create thread %d. Error is %d\n",x,output);
 		}
diff --git a/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/Makefile b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/Makefile
index 0ba8539..a9a9219 100644
--- a/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/Makefile
+++ b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_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,10 @@
 #
 # 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 = mirror_tests emfile-2k-0
 
 TESTFILES = 	mirror_tests.o lib.o\
 		linux_test_open.o yaffs_test_open.o\
@@ -53,67 +25,21 @@ TESTFILES = 	mirror_tests.o lib.o\
 		linux_test_unlink.o yaffs_test_unlink.o \
 		linux_test_write.o yaffs_test_write.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: mirror_tests
 
-$(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)
 
-mirror_tests: $(SYMLINKS) $(ALLOBJS)
-	gcc $(CFLLAG) -o $@ $(ALLOBJS)
 
 
+mirror_tests: $(FRAMEWORK_SOURCES) $(YAFFS_TEST_OBJS)
+	gcc $(CFLAGS) -o $@ $(YAFFS_TEST_OBJS)
 
-clean:
-	rm -f mirror_tests  $(ALLOBJS) core $(SYMLINKS) 
diff --git a/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.c b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.c
index cd4e5f2..071a313 100644
--- a/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.c
+++ b/direct/test-framework/timothy_tests/yaffs_and_linux_mirror_tests/mirror_tests.c
@@ -313,7 +313,7 @@ int compare_linux_and_yaffs(arg_temp *args_struct)
 	struct yaffs_stat yaffs_stat_struct;
 	struct stat linux_stat_struct;
 	yaffs_DIR *yaffs_open_dir;
-	yaffs_dirent *yaffs_current_file;
+	struct yaffs_dirent *yaffs_current_file;
 	
 	DIR *linux_open_dir;
 	struct dirent *linux_current_file;