[Kharness-commits] jlbec commits r53 - in trunk: . test_sources util

[svn-commits at oss.oracle.com]

Author: jlbec
Date: 2004-05-20 15:52:17 -0500 (Thu, 20 May 2004)
New Revision: 53

Modified:
   trunk/ChangeLog
   trunk/test_sources/test_remap.c
   trunk/util/snarf_extpatch
Log:
foo

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2003-07-22 18:52:17 UTC (rev 52)
+++ trunk/ChangeLog	2004-05-20 20:52:17 UTC (rev 53)
@@ -1,3 +1,7 @@
+2004-05-20	Joel Becker	<joel.becker at oracle.com>
+
+	* test_sources/test_remap.c: Small tweaks from wli.
+
 2003-07-14	Joel Becker	<joel.becker at oracle.com>
 
 	* util/snarf_{kernel,prepatch,extpatch}: Add -testN.

Modified: trunk/test_sources/test_remap.c
===================================================================
--- trunk/test_sources/test_remap.c	2003-07-22 18:52:17 UTC (rev 52)
+++ trunk/test_sources/test_remap.c	2004-05-20 20:52:17 UTC (rev 53)
@@ -290,14 +290,16 @@
 static void write_win(RunWindow *win, int c)
 {
     int i;
-    void *chunk_addr;
+    char *chunk_addr;
 
     for (i = 0, chunk_addr = win->addr; i < win->w_chunks;
          i++, chunk_addr += win->chunk_size)
     {
+	unsigned long *word = (unsigned long *)chunk_addr;
+
         memset(chunk_addr, c, sizeof(unsigned long));
         /* Store a chunk number in here - It'll show up in reverse */
-        (unsigned long)*(char *)(chunk_addr + sizeof(unsigned long)) = i;
+	word[1] = i;
     }
 }
 
@@ -468,21 +470,21 @@
     if (min)
         fprintf(stdout, " %dm, ", min);
     fprintf(stdout, "% 2ld.%06lds; U:", t_diff.tv_sec % 60,
-            t_diff.tv_usec);
+            (long)t_diff.tv_usec);
 
     timersub(tms_uend, tms_ustart, &t_diff);
     min = t_diff.tv_sec / 60;
     if (min)
         fprintf(stdout, " %dm, ", min);
     fprintf(stdout, "% 2ld.%06lds; S:", t_diff.tv_sec % 60,
-            t_diff.tv_usec);
+            (long)t_diff.tv_usec);
 
     timersub(tms_send, tms_sstart, &t_diff);
     min = t_diff.tv_sec / 60;
     if (min)
         fprintf(stdout, " %dm, ", min);
     fprintf(stdout, "% 2ld.%06lds\n", t_diff.tv_sec % 60,
-            t_diff.tv_usec);
+            (long)t_diff.tv_usec);
 }
 
 
@@ -517,7 +519,7 @@
 
 static int spawn_child(RunOptions *ro, RunCache *ca, RunWindow *win)
 {
-    int rc, try_count;
+    int rc, try_count = 0;
     pid_t pid;
     char *argvals[4];
     char *args[] = {

Modified: trunk/util/snarf_extpatch
===================================================================
--- trunk/util/snarf_extpatch	2003-07-22 18:52:17 UTC (rev 52)
+++ trunk/util/snarf_extpatch	2004-05-20 20:52:17 UTC (rev 53)
@@ -139,7 +139,7 @@
 *-mm[0-9]*)
     MMVER="${KERNEL_VERSION##*-mm}"
     MMVER="${MMVER%%-*}"
-    if [ "${BASE_SUBLEVEL}" -gt "59" -o \( "${BASE_SUBLEVEL}" = "59" -a "${MMVER}" -gt "8" \) ]
+    if [ "${BASE_PATCHLEVEL}" -gt "5" -o "${BASE_SUBLEVEL}" -gt "59" -o \( "${BASE_SUBLEVEL}" = "59" -a "${MMVER}" -gt "8" \) ]
     then
         URL_BASE="http://www.kernel.org/pub/linux/kernel/people/akpm/patches/${BASE_VERSION}.${BASE_PATCHLEVEL}/${BASE_VERSION}.${BASE_PATCHLEVEL}.${BASE_SUBLEVEL}/${KERNEL_VERSION}/"
     else