Changeset 4434

Timestamp:

09.03.2010 08:53:10 (5 months ago)

Author:

er13

Message:

target-tester:

• make it work again
• add e2fsprogs' tests

Location:

trunk/make/target-tester

Files:

• src/gt_cv_int_divbyzero_sigfpe.c (added)
• src/target-tester.c (modified) (7 diffs)
• target-tester.mk (modified) (4 diffs)

trunk/make/target-tester/src/target-tester.c

@@ -38 +38 @@
 #include <strings.h>
 //#include <snprintf.h>
+
+#include <sys/syscall.h>
+#include <unistd.h>
 
 struct cookiedata {
@@ -122 +125 @@
         printf("sizeof(__off64_t)=%d\n", sizeof(__off64_t));
 
+#ifdef __cplusplus
         {
             printf("cv_type_of_bool=");
@@ -136 +140 @@
                 printf("long\n");
         }
+#endif
 
         {
@@ -163 +168 @@
         }
 
+#ifdef __cplusplus
         {
             cookie_io_functions_t funcs = {reader, writer, seeker, closer};
@@ -169 +175 @@
             printf("cookie_io_functions_use_off64_t=%s\n", (fp && fseek(fp, 8192, SEEK_SET) == 0 && g.pos == 8192) ? "yes" : "no");
         }
+#endif
 
         {
@@ -269 +276 @@
             char s[16];
             int i, result, code;
-        
+
             for (i=0; i<(int)(sizeof(s)/sizeof(char)); i++)
                 s[i] = 'x';
@@ -290 +297 @@
             printf("wi_cv_snprintf_returns_ptr=%s\n", (result == 2) ? "no" : "yes");
         }
+
+#if 0
+        {
+            //doesn't compile -> no
+            int test_SYS = SYS_ioprio_set;
+            int test_NR = _NR_ioprio_set;
+        }
+#endif
+
+        {
+            /* The string "%2$d %1$d", with dollar characters protected from the shell's
+            dollar expansion (possibly an autoconf bug). */
+            static char format[] = { '%', '2', '$', 'd', ' ', '%', '1', '$', 'd', '\0' };
+            static char buf[100];
+            int code;
+
+            sprintf(buf, format, 33, 55);
+            code = (strcmp (buf, "55 33") == 0);
+            printf("gt_cv_func_printf_posix=%s\n", code ? "yes" : "no");
+        }
 }

trunk/make/target-tester/target-tester.mk

@@ -9 +9 @@
 $(PKG)_TARGET_BINARY_NOLFS:=$($(PKG)_DEST_DIR)/usr/bin/$($(PKG)_BINARY_NAME_NOLFS)
 
-$(PKG)_BINARY_NAME_MMAP:=ac_cv_func_mmap_fixed_mapped
-$(PKG)_BINARY_MMAP:=$($(PKG)_DIR)/$($(PKG)_BINARY_NAME_MMAP)
-$(PKG)_TARGET_BINARY_MMAP:=$($(PKG)_DEST_DIR)/usr/bin/$($(PKG)_BINARY_NAME_MMAP)
-
+$(PKG)_BINARIES:=ac_cv_func_mmap_fixed_mapped gt_cv_int_divbyzero_sigfpe
+$(PKG)_BINARIES_BUILD_DIR:=$($(PKG)_BINARIES:%=$($(PKG)_DIR)/%)
+$(PKG)_BINARIES_TARGET_DIR:=$($(PKG)_BINARIES:%=$($(PKG)_DEST_DIR)/usr/bin/%)
 
 TARGET_CFLAGS_WITHOUT_LARGEFILE_FLAGS:=$(strip $(subst $(CFLAGS_LARGEFILE),,$(TARGET_CFLAGS)))
@@ -21 +20 @@
 define TARGET_TESTER_COMPILE_BINARY
 $(1): $($(PKG)_DIR)/.configured
-        $(SUBMAKE) -C $(TARGET_TESTER_DIR) \
+        $(MAKE_ENV) \
+                $(MAKE) -C $(TARGET_TESTER_DIR) \
                 TARGET=$$(notdir $$@) \
                 PREREQUISITE=$(2) \
@@ -28 +28 @@
 endef
 
-$(eval $(call TARGET_TESTER_COMPILE_BINARY,$($(PKG)_BINARY_LFS),target-tester,$(TARGET_CXX),$(CFLAGS_LFS_ENABLED) -DINCLUDE_LFS_ONLY_TYPES))
-$(eval $(call TARGET_TESTER_COMPILE_BINARY,$($(PKG)_BINARY_NOLFS),target-tester,$(TARGET_CXX),$(CFLAGS_LFS_DISABLED)))
-$(eval $(call TARGET_TESTER_COMPILE_BINARY,$($(PKG)_BINARY_MMAP),$($(PKG)_BINARY_NAME_MMAP),$(TARGET_CC),$(CFLAGS_LFS_ENABLED)))
+$(eval $(call TARGET_TESTER_COMPILE_BINARY,$($(PKG)_BINARY_LFS),target-tester,$(TARGET_CC),$(CFLAGS_LFS_ENABLED) -DINCLUDE_LFS_ONLY_TYPES))
+$(eval $(call TARGET_TESTER_COMPILE_BINARY,$($(PKG)_BINARY_NOLFS),target-tester,$(TARGET_CC),$(CFLAGS_LFS_DISABLED)))
+$(foreach binary,$($(PKG)_BINARIES), \
+        $(eval $(call TARGET_TESTER_COMPILE_BINARY,$($(PKG)_DIR)/$(binary),$(binary),$(TARGET_CC),$(CFLAGS_LFS_ENABLED))) \
+)
 
-$($(PKG)_TARGET_BINARY_LFS) $($(PKG)_TARGET_BINARY_NOLFS) $($(PKG)_TARGET_BINARY_MMAP): $($(PKG)_DEST_DIR)/usr/bin/%: $($(PKG)_DIR)/%
+
+$($(PKG)_TARGET_BINARY_LFS) $($(PKG)_TARGET_BINARY_NOLFS) $($(PKG)_BINARIES_TARGET_DIR): $($(PKG)_DEST_DIR)/usr/bin/%: $($(PKG)_DIR)/%
         $(INSTALL_BINARY_STRIP)
 
 $(pkg)-math-functions: $($(PKG)_DIR)/.configured
-        PATH="$(TARGET_PATH)" \
-                $(SUBMAKE) -C $(TARGET_TESTER_DIR) \
+        $(MAKE_ENV) \
+                $(MAKE) -C $(TARGET_TESTER_DIR) \
                 CC="$(TARGET_CXX)" \
                 CFLAGS="$(TARGET_CFLAGS)" \
@@ -45 +48 @@
 $(pkg):
 
-$(pkg)-precompiled: $($(PKG)_TARGET_BINARY_LFS) $($(PKG)_TARGET_BINARY_NOLFS) $($(PKG)_TARGET_BINARY_MMAP)
+$(pkg)-precompiled: $($(PKG)_TARGET_BINARY_LFS) $($(PKG)_TARGET_BINARY_NOLFS) $($(PKG)_BINARIES_TARGET_DIR)
 
 $(pkg)-clean:
-        -$(SUBMAKE) -C $(TARGET_TESTER_DIR) TARGET=$(TARGET_TESTER_BINARY_NAME_LFS) clean
-        -$(SUBMAKE) -C $(TARGET_TESTER_DIR) TARGET=$(TARGET_TESTER_BINARY_NAME_NOLFS) clean
+        -$(MAKE_ENV) $(MAKE) -C $(TARGET_TESTER_DIR) TARGET=$(TARGET_TESTER_BINARY_NAME_LFS) clean
+        -$(MAKE_ENV) $(MAKE) -C $(TARGET_TESTER_DIR) TARGET=$(TARGET_TESTER_BINARY_NAME_NOLFS) clean
 
 $(pkg)-uninstall:
-        $(RM) $(TARGET_TESTER_TARGET_BINARY_LFS) $(TARGET_TESTER_TARGET_BINARY_NOLFS)
+        $(RM) $(TARGET_TESTER_TARGET_BINARY_LFS) $(TARGET_TESTER_TARGET_BINARY_NOLFS) $(TARGET_TESTER_BINARIES_TARGET_DIR)
 
 $(PKG_FINISH)