YTIME_T 32 bit test now builds with 32 bit time

Signed-off-by: Timothy Manning <codedraftsman@gmail.com>

diff --git a/direct/test-framework/FrameworkRules.mk b/direct/test-framework/FrameworkRules.mk
index bf7ae0c1676dec2be38d4fcdbcc2ba29f4239f0d..684062c0c5dae6925c59bf2c51186e66bec1fb45 100644 (file)
--- a/direct/test-framework/FrameworkRules.mk
+++ b/direct/test-framework/FrameworkRules.mk
@@ -17,7 +17,7 @@
 
 #EXTRA_COMPILE_FLAGS = -DYAFFS_IGNORE_TAGS_ECC
 
-CFLAGS =      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_YAFFS2  -DCONFIG_YAFFS_DEFINES_TYPES
+CFLAGS +=      -DCONFIG_YAFFS_DIRECT -DCONFIG_YAFFS_YAFFS2  -DCONFIG_YAFFS_DEFINES_TYPES
 CFLAGS +=     -DCONFIG_YAFFS_PROVIDE_DEFS -DCONFIG_YAFFSFS_PROVIDE_VALUES
 CFLAGS +=     -DCONFIG_YAFFS_MONITOR_MALLOC
 CFLAGS +=    -Wall -g $(EXTRA_COMPILE_FLAGS) -Wstrict-aliasing -Werror
@@ -108,4 +108,3 @@ $(FRAMEWORKEXTRASYMLINKS):
        ln -s $(YDI_FRAMEWORK_DIR)/$@ $@
 
 $(ALLOBJS): %.o: %.c
-       gcc -c $(CFLAGS)   -o $@ $<

diff --git a/direct/test-framework/unit_tests/64_and_32_bit_time/32_bit/Makefile b/direct/test-framework/unit_tests/64_and_32_bit_time/32_bit/Makefile
index daec17635f946d7a5123ebbd04711c3e9375d108..8bcaf721985f986d846b5e19cbee89c86142ddd5 100644 (file)
--- a/direct/test-framework/unit_tests/64_and_32_bit_time/32_bit/Makefile
+++ b/direct/test-framework/unit_tests/64_and_32_bit_time/32_bit/Makefile
@@ -1,4 +1,4 @@
-# Makefile for 64 bit time test.
+# Makefile for 32 bit time test.
 #
 #
 # YAFFS: Yet another Flash File System. A NAND-flash specific file system.
@@ -21,6 +21,7 @@ YDI_FRAMEWORK_DIR = ../../../
 CLEAN_OBJS = time_32_tests emfile-2k-0 emfile-nand  emfile-nand128MB 
 TESTFILES =    time_32_tests.o
 
+CFLAGS = -DYAFFS_USE_32_BIT_TIME_T
 all: time_32_tests
 
 YAFFS_TEST_OBJS = $(COMMONTESTOBJS) $(TESTFILES)