memtester: update to 4.1.3

SVN-Revision: 21067

diff --git a/utils/memtester/Makefile b/utils/memtester/Makefile
index 9b3d43b215db97109abf75c25931b354e0908a07..132ada257e8befd6a7d5bc10bd676811213993e9 100644 (file)
--- a/utils/memtester/Makefile
+++ b/utils/memtester/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2007 OpenWrt.org
+# Copyright (C) 2007-2010 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=memtester
-PKG_VERSION:=4.1.2
+PKG_VERSION:=4.1.3
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
 PKG_SOURCE_URL:=http://pyropus.ca/software/memtester/old-versions/
-PKG_MD5SUM:=33c744ac434eb1f3d7e09c891f2979d6
+PKG_MD5SUM:=e562451620cf5343016950462bc0dc38
 
 include $(INCLUDE_DIR)/package.mk
 

diff --git a/utils/memtester/patches/100-quiet.diff b/utils/memtester/patches/100-quiet.diff
index 2f4e449a4c48a0518b1afc05573fb65cf97c7f5c..ebfba6995dc11b519ebf280f402818b207170dab 100644 (file)
--- a/utils/memtester/patches/100-quiet.diff
+++ b/utils/memtester/patches/100-quiet.diff
@@ -44,8 +44,8 @@
 +
  #define PROGRESSLEN 4
  #define PROGRESSOFTEN 2500
- 
-@@ -64,16 +75,16 @@ int test_stuck_address(ulv *bufa, size_t
+ #define ONE 0x00000001L
+@@ -65,16 +76,16 @@ int test_stuck_address(ulv *bufa, size_t
      printf("           ");
      fflush(stdout);
      for (j = 0; j < 16; j++) {
@@ -66,7 +66,7 @@
          fflush(stdout);
          p1 = (ulv *) bufa;
          for (i = 0; i < count; i++, p1++) {
-@@ -96,7 +107,7 @@ int test_stuck_address(ulv *bufa, size_t
+@@ -97,7 +108,7 @@ int test_stuck_address(ulv *bufa, size_t
              }
          }
      }
@@ -75,7 +75,7 @@
      fflush(stdout);
      return 0;
  }
-@@ -111,13 +122,13 @@ int test_random_value(ulv *bufa, ulv *bu
+@@ -112,13 +123,13 @@ int test_random_value(ulv *bufa, ulv *bu
      fflush(stdout);
      for (i = 0; i < count; i++) {
          *p1++ = *p2++ = rand_ul();
@@ -91,7 +91,7 @@
      fflush(stdout);
      return compare_regions(bufa, bufb, count);
  }
-@@ -225,23 +236,23 @@ int test_solidbits_comparison(ulv *bufa,
+@@ -226,23 +237,23 @@ int test_solidbits_comparison(ulv *bufa,
      printf("           ");
      fflush(stdout);
      for (j = 0; j < 64; j++) {
@@ -120,7 +120,7 @@
      fflush(stdout);
      return 0;
  }
-@@ -256,23 +267,23 @@ int test_checkerboard_comparison(ulv *bu
+@@ -257,23 +268,23 @@ int test_checkerboard_comparison(ulv *bu
      printf("           ");
      fflush(stdout);
      for (j = 0; j < 64; j++) {
@@ -149,7 +149,7 @@
      fflush(stdout);
      return 0;
  }
-@@ -283,25 +294,25 @@ int test_blockseq_comparison(ulv *bufa, 
+@@ -284,25 +295,25 @@ int test_blockseq_comparison(ulv *bufa, 
      unsigned int j;
      size_t i;
  
@@ -181,7 +181,7 @@
      fflush(stdout);
      return 0;
  }
-@@ -315,10 +326,10 @@ int test_walkbits0_comparison(ulv *bufa,
+@@ -316,10 +327,10 @@ int test_walkbits0_comparison(ulv *bufa,
      printf("           ");
      fflush(stdout);
      for (j = 0; j < UL_LEN * 2; j++) {
@@ -194,8 +194,8 @@
          fflush(stdout);
          for (i = 0; i < count; i++) {
              if (j < UL_LEN) { /* Walk it up. */
-@@ -327,14 +338,14 @@ int test_walkbits0_comparison(ulv *bufa,
-                 *p1++ = *p2++ = 0x00000001 << (UL_LEN * 2 - j - 1);
+@@ -328,14 +339,14 @@ int test_walkbits0_comparison(ulv *bufa,
+                 *p1++ = *p2++ = ONE << (UL_LEN * 2 - j - 1);
              }
          }
 -        printf("\b\b\b\b\b\b\b\b\b\b\b");
@@ -212,7 +212,7 @@
      fflush(stdout);
      return 0;
  }
-@@ -345,13 +356,13 @@ int test_walkbits1_comparison(ulv *bufa,
+@@ -346,13 +357,13 @@ int test_walkbits1_comparison(ulv *bufa,
      unsigned int j;
      size_t i;
  
@@ -229,8 +229,8 @@
          fflush(stdout);
          for (i = 0; i < count; i++) {
              if (j < UL_LEN) { /* Walk it up. */
-@@ -360,14 +371,14 @@ int test_walkbits1_comparison(ulv *bufa,
-                 *p1++ = *p2++ = UL_ONEBITS ^ (0x00000001 << (UL_LEN * 2 - j - 1));
+@@ -361,14 +372,14 @@ int test_walkbits1_comparison(ulv *bufa,
+                 *p1++ = *p2++ = UL_ONEBITS ^ (ONE << (UL_LEN * 2 - j - 1));
              }
          }
 -        printf("\b\b\b\b\b\b\b\b\b\b\b");
@@ -247,7 +247,7 @@
      fflush(stdout);
      return 0;
  }
-@@ -378,13 +389,13 @@ int test_bitspread_comparison(ulv *bufa,
+@@ -379,13 +390,13 @@ int test_bitspread_comparison(ulv *bufa,
      unsigned int j;
      size_t i;
  
@@ -264,8 +264,8 @@
          fflush(stdout);
          for (i = 0; i < count; i++) {
              if (j < UL_LEN) { /* Walk it up. */
-@@ -399,14 +410,14 @@ int test_bitspread_comparison(ulv *bufa,
-                                     | (0x00000001 << (UL_LEN * 2 + 1 - j)));
+@@ -400,14 +411,14 @@ int test_bitspread_comparison(ulv *bufa,
+                                     | (ONE << (UL_LEN * 2 + 1 - j)));
              }
          }
 -        printf("\b\b\b\b\b\b\b\b\b\b\b");
@@ -282,7 +282,7 @@
      fflush(stdout);
      return 0;
  }
-@@ -418,29 +429,29 @@ int test_bitflip_comparison(ulv *bufa, u
+@@ -419,29 +430,29 @@ int test_bitflip_comparison(ulv *bufa, u
      ul q;
      size_t i;
  
@@ -290,7 +290,7 @@
 +    dprintf("           ");
      fflush(stdout);
      for (k = 0; k < UL_LEN; k++) {
-         q = 0x00000001 << k;
+         q = ONE << k;
          for (j = 0; j < 8; j++) {
 -            printf("\b\b\b\b\b\b\b\b\b\b\b");
 +            dprintf("\b\b\b\b\b\b\b\b\b\b\b");