Re: Advance warning of likley interruption of test results

[Mark Wielaard <mark@klomp.org>]

[-- Attachment #1: Type: text/plain, Size: 1381 bytes --]

On Fri, 2007-10-05 at 07:51 -0400, Kris Van Hees wrote:
> In view of bugzilla tickets 5115, 5117, 5118, 5119 (and Mark's independently
> filed ticket (5114)

Part of these are because the kernel version strings are all over the
place with newer fedora kernels which means we don't properly detect
when utrace is installed and unresolvedOnUtrace() doesn't trigger. The
only constant seems to be that it ends with .fc<release>[xen|debug] so I
changed the fedora release matcher to look for that (we loose the major
and minor number of the distro version, but we weren't using that
anyway). That resolves 2 of them, the other two I added to
unresolvedOnUtrace(5144) and added more info to the bug tracker about
the kernel versions when this occurs (full investigation needed, but I
don't have time for that right now).

frysk-sys/frysk/junit/ChangeLog
2007-10-05  Mark Wielaard  <mwielaard@redhat.com>

    * KernelVersion.java (fedoraMajor, fedoraMinor): Removed.
    (KernelVersion): Adjust fedoraPattern to only check for fc ending.
    (newer): Don't check fedoraMajor or fedoraMinor.

frysk-core/frysk/proc/ChangeLog
2007-10-05  Mark Wielaard  <mwielaard@redhat.com>

    * TestProcStopped.java (testStoppedAckDaemon): Mark
    unresolvedOnUtrace(5114).
    (testStoppedDetached): Likewise.

Tested on 2.6.22.7-57.fc6 (x86_64) and 2.6.23-0.217.rc9.git1.fc8 (x86).

Cheers,

Mark

[-- Attachment #2: stopped-utrace.patch --]
[-- Type: text/x-patch, Size: 3689 bytes --]

Index: frysk-core/frysk/proc/TestProcStopped.java
===================================================================
RCS file: /cvs/frysk/frysk-core/frysk/proc/TestProcStopped.java,v
retrieving revision 1.23
diff -u -r1.23 TestProcStopped.java
--- frysk-core/frysk/proc/TestProcStopped.java	9 Aug 2007 18:32:44 -0000	1.23
+++ frysk-core/frysk/proc/TestProcStopped.java	5 Oct 2007 14:06:27 -0000
@@ -1,6 +1,6 @@
 // This file is part of the program FRYSK.
 //
-// Copyright 2005, 2006, Red Hat Inc.
+// Copyright 2005, 2006, 2007, Red Hat Inc.
 //
 // FRYSK is free software; you can redistribute it and/or modify it
 // under the terms of the GNU General Public License as published by
@@ -63,6 +63,8 @@
 
   public void testStoppedAckDaemon ()
   {
+    if (unresolvedOnUtrace(5114))
+      return;
     SlaveOffspring ackProc = SlaveOffspring.createDaemon();
     stopped(ackProc, 1);
     assertRunUntilStop("testStoppedAckDaemon");
@@ -70,6 +72,8 @@
 
   public void testStoppedDetached ()
   {
+    if (unresolvedOnUtrace(5114))
+      return;
     SlaveOffspring ackProc = SlaveOffspring.createChild();
     stopped(ackProc, 1);
     assertRunUntilStop("testStoppedDetached");
Index: frysk-sys/frysk/junit/KernelVersion.java
===================================================================
RCS file: /cvs/frysk/frysk-sys/frysk/junit/KernelVersion.java,v
retrieving revision 1.1
diff -u -r1.1 KernelVersion.java
--- frysk-sys/frysk/junit/KernelVersion.java	17 Jul 2007 18:01:41 -0000	1.1
+++ frysk-sys/frysk/junit/KernelVersion.java	5 Oct 2007 14:06:27 -0000
@@ -58,8 +58,6 @@
   private boolean isFedora = false;
   private boolean isVanilla = false;
   private int fedoraRelease = 0;
-  private int fedoraMajor = 0;
-  private int fedoraMinor = 0;
 
   public int getVersion()
   {
@@ -96,16 +94,6 @@
     return fedoraRelease;
   }
 
-  public int getFedoraMajor()
-  {
-    return fedoraMajor;
-  }
-
-    public int getFedoraMinor()
-  {
-    return fedoraMinor;
-  }
-
   /**
    * Construct a kernel version object using the kernel release string
    * from uname.
@@ -116,7 +104,7 @@
     if (kernelPattern == null)
       {
 	kernelPattern = Pattern.compile("^(\\d+)\\.(\\d+)\\.(\\d+)");
-	fedoraPattern = Pattern.compile("^-(\\d+).(\\d+)\\.fc(\\d+)(.*)$");
+	fedoraPattern = Pattern.compile("\\.fc(\\d+)(.*)$");
 	vanillaPattern = Pattern.compile("^\\.(\\d+)$");
       }
     Matcher kernelMatcher = kernelPattern.matcher(release);
@@ -129,12 +117,10 @@
     int extra = kernelMatcher.end();
     extraVersion = release.substring(extra);
     Matcher fedoraMatcher = fedoraPattern.matcher(extraVersion);
-    if (fedoraMatcher.lookingAt())
+    if (fedoraMatcher.find())
       {
 	isFedora = true;
-	fedoraMajor = Integer.parseInt(fedoraMatcher.group(1));
-	fedoraMinor = Integer.parseInt(fedoraMatcher.group(2));
-	fedoraRelease = Integer.parseInt(fedoraMatcher.group(3));
+	fedoraRelease = Integer.parseInt(fedoraMatcher.group(1));
 	return;
       }
     Matcher vanillaMatcher = vanillaPattern.matcher(extraVersion);
@@ -156,8 +142,7 @@
       return false;
     if (isFedora && kv.isFedora)
       {
-	if (fedoraRelease == kv.fedoraRelease && fedoraMajor == kv.fedoraMajor
-	    && fedoraMinor == kv.fedoraMinor)
+	if (fedoraRelease == kv.fedoraRelease)
 	  return true;
 	else
 	  return false;
@@ -193,13 +178,8 @@
       {
 	if (fedoraRelease > kv.fedoraRelease)
 	  return true;
-	else if (fedoraRelease < kv.fedoraRelease)
-	  return false;
-	if (fedoraMajor > kv.fedoraMajor)
-	  return true;
-	else if (fedoraMajor < kv.fedoraMajor)
+	else
 	  return false;
-	return fedoraMinor > kv.fedoraMinor;
       }
     else if (isVanilla && kv.isVanilla)
       {