bakabtw/packages
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[package] update memtester to 4.1.2 (#5915)

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/packages@17829 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2009-10-03 09:59:04 +00:00
parent 8e75960578
commit 1a6d24dfbd
2 changed files with 40 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/memtester/Makefile
View File

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=memtester PKG_NAME:=memtester
PKG_VERSION:=4.0.8 PKG_VERSION:=4.1.2
PKG_RELEASE:=1 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
PKG_SOURCE_URL:=http://pyropus.ca/software/memtester/old-versions/ PKG_SOURCE_URL:=http://pyropus.ca/software/memtester/old-versions/
PKG_MD5SUM:=a4971ed1ccaf5b2e2148fd66b0eb7363 PKG_MD5SUM:=33c744ac434eb1f3d7e09c891f2979d6
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk

72
utils/memtester/patches/100-quiet.diff
View File

@ -1,25 +1,27 @@
diff -urN memtester-4.0.8.old/memtester.c memtester-4.0.8/memtester.c --- a/memtester.c
--- memtester-4.0.8/memtester.c 2007-11-21 16:54:57.000000000 +0100 +++ b/memtester.c
+++ memtester-4.0.8/memtester.c 2008-05-22 02:15:56.925302194 +0200 @@ -123,7 +123,7 @@ int main(int argc, char **argv) {
@@ -98,6 +98,14 @@
pagesizemask = (ptrdiff_t) ~(pagesize - 1); pagesizemask = (ptrdiff_t) ~(pagesize - 1);
printf("pagesizemask is 0x%tx\n", pagesizemask); printf("pagesizemask is 0x%tx\n", pagesizemask);
+ if (argc > 1 && !strcmp(argv[1], "-q")) { - while ((opt = getopt(argc, argv, "p:")) != -1) {
+ int j; + while ((opt = getopt(argc, argv, "qp:")) != -1) {
+ quiet = 1; switch (opt) {
+ for(j = 2; j < argc; j++) case 'p':
+ argv[j - 1] = argv[j]; errno = 0;
+ argc--; @@ -150,6 +150,9 @@ int main(int argc, char **argv) {
+ } /* okay, got address */
+ use_phys = 1;
if (argc < 2) { break;
fprintf(stderr, "need memory argument, in MB\n"); + case 'q':
exit(EXIT_FAIL_NONSTARTER); + quiet = 1;
diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c + break;
--- memtester-4.0.8/tests.c 2007-11-21 16:54:57.000000000 +0100 default: /* '?' */
+++ memtester-4.0.8/tests.c 2008-05-22 02:38:46.389302357 +0200 usage(argv[0]); /* doesn't return */
@@ -17,11 +17,22 @@ }
--- a/tests.c
+++ b/tests.c
@@ -17,12 +17,23 @@
#include <stdio.h> #include <stdio.h>
#include <stdlib.h> #include <stdlib.h>
#include <limits.h> #include <limits.h>
@ -27,6 +29,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
#include "types.h" #include "types.h"
#include "sizes.h" #include "sizes.h"
#include "memtester.h"
+int quiet = 0; +int quiet = 0;
char progress[] = "-\\|/"; char progress[] = "-\\|/";
@ -42,7 +45,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
#define PROGRESSLEN 4 #define PROGRESSLEN 4
#define PROGRESSOFTEN 2500 #define PROGRESSOFTEN 2500
@@ -52,16 +63,16 @@ @@ -64,16 +75,16 @@ int test_stuck_address(ulv *bufa, size_t
printf(" "); printf(" ");
fflush(stdout); fflush(stdout);
for (j = 0; j < 16; j++) { for (j = 0; j < 16; j++) {
@ -63,7 +66,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
fflush(stdout); fflush(stdout);
p1 = (ulv *) bufa; p1 = (ulv *) bufa;
for (i = 0; i < count; i++, p1++) { for (i = 0; i < count; i++, p1++) {
@@ -75,7 +86,7 @@ @@ -96,7 +107,7 @@ int test_stuck_address(ulv *bufa, size_t
} }
} }
} }
@ -72,7 +75,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
fflush(stdout); fflush(stdout);
return 0; return 0;
} }
@@ -90,13 +101,13 @@ @@ -111,13 +122,13 @@ int test_random_value(ulv *bufa, ulv *bu
fflush(stdout); fflush(stdout);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
*p1++ = *p2++ = rand_ul(); *p1++ = *p2++ = rand_ul();
@ -88,7 +91,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
fflush(stdout); fflush(stdout);
return compare_regions(bufa, bufb, count); return compare_regions(bufa, bufb, count);
} }
@@ -204,23 +215,23 @@ @@ -225,23 +236,23 @@ int test_solidbits_comparison(ulv *bufa,
printf(" "); printf(" ");
fflush(stdout); fflush(stdout);
for (j = 0; j < 64; j++) { for (j = 0; j < 64; j++) {
@ -117,7 +120,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
fflush(stdout); fflush(stdout);
return 0; return 0;
} }
@@ -235,23 +246,23 @@ @@ -256,23 +267,23 @@ int test_checkerboard_comparison(ulv *bu
printf(" "); printf(" ");
fflush(stdout); fflush(stdout);
for (j = 0; j < 64; j++) { for (j = 0; j < 64; j++) {
@ -146,7 +149,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
fflush(stdout); fflush(stdout);
return 0; return 0;
} }
@@ -262,25 +273,25 @@ @@ -283,25 +294,25 @@ int test_blockseq_comparison(ulv *bufa,
unsigned int j; unsigned int j;
size_t i; size_t i;
@ -178,7 +181,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
fflush(stdout); fflush(stdout);
return 0; return 0;
} }
@@ -294,10 +305,10 @@ @@ -315,10 +326,10 @@ int test_walkbits0_comparison(ulv *bufa,
printf(" "); printf(" ");
fflush(stdout); fflush(stdout);
for (j = 0; j < UL_LEN * 2; j++) { for (j = 0; j < UL_LEN * 2; j++) {
@ -191,7 +194,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
fflush(stdout); fflush(stdout);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (j < UL_LEN) { /* Walk it up. */ if (j < UL_LEN) { /* Walk it up. */
@@ -306,14 +317,14 @@ @@ -327,14 +338,14 @@ int test_walkbits0_comparison(ulv *bufa,
*p1++ = *p2++ = 0x00000001 << (UL_LEN * 2 - j - 1); *p1++ = *p2++ = 0x00000001 << (UL_LEN * 2 - j - 1);
} }
} }
@ -209,7 +212,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
fflush(stdout); fflush(stdout);
return 0; return 0;
} }
@@ -324,13 +335,13 @@ @@ -345,13 +356,13 @@ int test_walkbits1_comparison(ulv *bufa,
unsigned int j; unsigned int j;
size_t i; size_t i;
@ -226,7 +229,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
fflush(stdout); fflush(stdout);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (j < UL_LEN) { /* Walk it up. */ if (j < UL_LEN) { /* Walk it up. */
@@ -339,14 +350,14 @@ @@ -360,14 +371,14 @@ int test_walkbits1_comparison(ulv *bufa,
*p1++ = *p2++ = UL_ONEBITS ^ (0x00000001 << (UL_LEN * 2 - j - 1)); *p1++ = *p2++ = UL_ONEBITS ^ (0x00000001 << (UL_LEN * 2 - j - 1));
} }
} }
@ -244,7 +247,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
fflush(stdout); fflush(stdout);
return 0; return 0;
} }
@@ -357,13 +368,13 @@ @@ -378,13 +389,13 @@ int test_bitspread_comparison(ulv *bufa,
unsigned int j; unsigned int j;
size_t i; size_t i;
@ -261,7 +264,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
fflush(stdout); fflush(stdout);
for (i = 0; i < count; i++) { for (i = 0; i < count; i++) {
if (j < UL_LEN) { /* Walk it up. */ if (j < UL_LEN) { /* Walk it up. */
@@ -378,14 +389,14 @@ @@ -399,14 +410,14 @@ int test_bitspread_comparison(ulv *bufa,
| (0x00000001 << (UL_LEN * 2 + 1 - j))); | (0x00000001 << (UL_LEN * 2 + 1 - j)));
} }
} }
@ -279,7 +282,7 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
fflush(stdout); fflush(stdout);
return 0; return 0;
} }
@@ -397,29 +408,29 @@ @@ -418,29 +429,29 @@ int test_bitflip_comparison(ulv *bufa, u
ul q; ul q;
size_t i; size_t i;
@ -315,9 +318,8 @@ diff -urN memtester-4.0.8.old/tests.c memtester-4.0.8/tests.c
fflush(stdout); fflush(stdout);
return 0; return 0;
} }
diff -urN memtester-4.0.8.old/tests.h memtester-4.0.8/tests.h --- a/tests.h
--- memtester-4.0.8.old/tests.h 2007-11-21 16:54:57.000000000 +0100 +++ b/tests.h
+++ memtester-4.0.8/tests.h 2008-05-22 01:51:15.072298292 +0200
@@ -14,6 +14,8 @@ @@ -14,6 +14,8 @@
* *
*/ */