2018/09/09(Sun) AM11:56:

  <libfiletype/testdata>
    * Correct Makefile (build error)

diff --git a/Makefile b/Makefile
index 8e50a92..5d9f594 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -20,6 +20,9 @@ LIBINTEL64ASM_DIR = libintel64asm
 LIBBROWNIE_TARGET = libbrownie.a
 LIBBROWNIE_DIR = libbrownie
 
+LIBFILETYPE_TARGET = libfiletype.a
+LIBFILETYPE_DIR = libfiletype
+
 LIBGOBLIN_TARGET = libgoblin.a
 LIBGOBLIN_DIR = libgoblin
 
@@ -28,6 +31,7 @@ TESTPG02_TARGET = dwarftest
 TESTPG_DIR = testpg
 
 TESTDATA_DIR = testdata
+TESTDATA_TARGET = ./$(TESTDATA_DIR)/drd64_testdata
 
 TOOL_COREOUT_TARGET = coreout
 TOOLPG_DIR = toolpg
@@ -36,9 +40,9 @@ TEST_TARGET = drdrv1
 TEST_OBJS = drdrv1.o
 TEST_LIBS = $(LIBDRD64_TARGET) $(LIBBROWNIE_TARGET) $(LIBGOBLIN)
 
-TESTDATA_DIR = testdata
 
-all:   $(LIBBROWNIE_TARGET) \
+all:   $(TESTDATA_TARGET) \
+               $(LIBBROWNIE_TARGET) \
                $(DEBUGD_TARGET) \
                $(MARSHALD_TARGET) \
                $(LIBDRD64_TARGET) \
@@ -61,6 +65,9 @@ $(LIBINTEL64ASM_TARGET):
 $(LIBDRD64_TARGET):
        $(MAKE) -C $(LIBDRD64_DIR) all
 
+$(LIBFILETYPE_TARGET):
+       $(MAKE) -C $(LIBFILETYPE_DIR) all
+
 $(LIBGOBLIN_TARGET):
        $(MAKE) -C $(LIBGOBLIN_DIR) all
 
@@ -88,6 +95,7 @@ clean:
        rm -f $(LIBINTEL64ASM_TARGET)
        rm -f $(LIBDRD64_TARGET)
        rm -f $(LIBGOBLIN_TARGET)
+       rm -f $(LIBFILETYPE_TARGET)
        rm -f $(TESTPG01_TARGET)
        rm -f $(TESTPG02_TARGET)
        rm -f $(TEST_TARGET)
@@ -95,9 +103,11 @@ clean:
        $(MAKE) -C $(LIBBROWNIE_DIR) clean
        $(MAKE) -C $(LIBINTEL64ASM_DIR) clean
        $(MAKE) -C $(LIBDRD64_DIR) clean
+       $(MAKE) -C $(LIBFILETYPE_DIR) clean
        $(MAKE) -C $(LIBGOBLIN_DIR) clean
        $(MAKE) -C $(DEAMON_DIR) clean
        $(MAKE) -C $(TESTPG_DIR) clean
+       $(MAKE) -C $(TESTDATA_DIR) clean
 
 backup:
        make clean

diff --git a/libfiletype/Makefile b/libfiletype/Makefile
index 302d6f6..48c3d7a 100644 (file)
--- a/libfiletype/Makefile
+++ b/libfiletype/Makefile
@@ -75,6 +75,8 @@ TEST_OBJS = \
                test_libfiletype_binaryfile.o
 TEST_HEADER = \
                test_libfiletype.h
+TESTDATA_FILES = \
+               ../testdata/drd64_testdata
 
 all:   $(TARGET) test
 build: $(TARGET)
@@ -95,12 +97,15 @@ drd64_libfiletype_binaryfile.o: drd64_libfiletype_binaryfile.c $(HEADER)
        $(CC) -c -o drd64_libfiletype_binaryfile.o $(FLAGS_DEBUG) $(FLAGS_COMPILE) \
                                drd64_libfiletype_binaryfile.c
 
-$(TARGET): $(OBJS) $(LIBRARY)
+$(TARGET): $(OBJS) $(LIBRARY) $(TESTDATA_FILES)
        rm -f ../$(TARGET)
+       make -C ../testdata all
        ar rv $(TARGET) $(OBJS) $(LIBRARY)
        ranlib $(TARGET)
        cp $(TARGET) ..
 
+$(TESTDATA_FILES):
+       make -C ../testdata all
 
 test_libfiletype.o: test_libfiletype.c $(HEADER) $(TEST_HEADER)
        $(CC) -c -o test_libfiletype.o \

diff --git a/libfiletype/test_libfiletype_textfile.c b/libfiletype/test_libfiletype_textfile.c
index 6b30a87..f410537 100644 (file)
--- a/libfiletype/test_libfiletype_textfile.c
+++ b/libfiletype/test_libfiletype_textfile.c
@@ -113,7 +113,7 @@ void Test_LibFileType_TextFile_VerifyTextFile_test00_003(void)
        close( i_fd );
        
        CU_ASSERT( 0x00 == i_err );
-       CU_ASSERT( 74 == dw_lines );
+       CU_ASSERT( 77 == dw_lines );
        CU_ASSERT( 78 == dw_length );
 
        LibFileType_Term();

diff --git a/testdata/Makefile b/testdata/Makefile
index 51219c3..e74acd1 100644 (file)
--- a/testdata/Makefile
+++ b/testdata/Makefile
@@ -47,9 +47,14 @@ TESTPG02_TARGET = dwarftest
 TESTPG02_OBJ = dwarftest dwarfnodbg dwarfnodbg.dbg \
                                libsotest.so libsonodbg.so libsonodbg.dbg
 
+TESTDATA_TARGET = drd64_testdata
+
 all: setup coreout.core $(TESTPG01_TARGET) $(TESTPG02_TARGET)
 
+TESTDATA_TARGET: all
+
 setup:
+       touch $(TESTDATA_TARGET)
        cp ../$(LIBINTEL64ASM_DIR)/x8664db.csv .
 
 coreout.core:
@@ -69,4 +74,4 @@ clean:
        rm -f coreout
        rm -f $(TESTPG01_TARGET) 
        rm -f $(TESTPG02_OBJ) 
-
+       rm -f $(TESTDATA_TARGET)